Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / captive_portal / captive_portal_tab_reloader_unittest.cc

diff --git a/src/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/src/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
index 1c52a47..cf86439 100644 (file)
--- a/src/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
+++ b/src/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
@@ -73,14 +73,11 @@ class MockInterstitialPageDelegate : public content::InterstitialPageDelegate {
     interstitial_page->Show();
   }
 
-  virtual ~MockInterstitialPageDelegate() {
-  }
+  ~MockInterstitialPageDelegate() override {}
 
  private:
   // InterstitialPageDelegate implementation:
-  virtual std::string GetHTMLContents() OVERRIDE {
-    return "HTML Contents";
-  }
+  std::string GetHTMLContents() override { return "HTML Contents"; }
 
   DISALLOW_COPY_AND_ASSIGN(MockInterstitialPageDelegate);
 };
@@ -88,7 +85,7 @@ class MockInterstitialPageDelegate : public content::InterstitialPageDelegate {
 class CaptivePortalTabReloaderTest : public ChromeRenderViewHostTestHarness {
  public:
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     tab_reloader_.reset(new testing::StrictMock<TestCaptivePortalTabReloader>(
         web_contents()));
@@ -97,7 +94,7 @@ class CaptivePortalTabReloaderTest : public ChromeRenderViewHostTestHarness {
     tab_reloader_->set_slow_ssl_load_time(base::TimeDelta());
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     EXPECT_FALSE(tab_reloader().TimerRunning());
     tab_reloader_.reset(NULL);
     ChromeRenderViewHostTestHarness::TearDown();