Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / search / iframe_source_unittest.cc

diff --git a/src/chrome/browser/search/iframe_source_unittest.cc b/src/chrome/browser/search/iframe_source_unittest.cc
index 801cb87..728de4c 100644 (file)
--- a/src/chrome/browser/search/iframe_source_unittest.cc
+++ b/src/chrome/browser/search/iframe_source_unittest.cc
@@ -38,27 +38,23 @@ class TestIframeSource : public IframeSource {
   using IframeSource::SendJSWithOrigin;
 
  protected:
-  virtual std::string GetSource() const OVERRIDE {
-    return "test";
-  }
+  std::string GetSource() const override { return "test"; }
 
-  virtual bool ServesPath(const std::string& path) const OVERRIDE {
+  bool ServesPath(const std::string& path) const override {
     return path == "/valid.html" || path == "/valid.js";
   }
 
-  virtual void StartDataRequest(
+  void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
-      const content::URLDataSource::GotDataCallback& callback) OVERRIDE {
-  }
+      const content::URLDataSource::GotDataCallback& callback) override {}
 
   // RenderFrameHost is hard to mock in concert with everything else, so stub
   // this method out for testing.
-  virtual bool GetOrigin(
-      int process_id,
-      int render_frame_id,
-      std::string* origin) const OVERRIDE {
+  bool GetOrigin(int process_id,
+                 int render_frame_id,
+                 std::string* origin) const override {
     if (process_id == kInstantRendererPID) {
       *origin = kInstantOrigin;
       return true;
@@ -130,7 +126,7 @@ class IframeSourceTest : public testing::Test {
   }
 
  private:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     source_.reset(new TestIframeSource());
     callback_ = base::Bind(&IframeSourceTest::SaveResponse,
                            base::Unretained(this));
@@ -141,9 +137,7 @@ class IframeSourceTest : public testing::Test {
     response_ = NULL;
   }
 
-  virtual void TearDown() {
-    source_.reset();
-  }
+  void TearDown() override { source_.reset(); }
 
   void SaveResponse(base::RefCountedMemory* data) {
     response_ = data;