Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / net / network_portal_detector_impl_browsertest.cc

diff --git a/src/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/src/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
index d9a52ee..b34cf1e 100644 (file)
--- a/src/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/src/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
@@ -31,11 +31,11 @@ namespace chromeos {
 
 namespace {
 
-const char* kNotificationId =
+const char* const kNotificationId =
     NetworkPortalNotificationController::kNotificationId;
-const char* kNotificationMetric =
+const char* const kNotificationMetric =
     NetworkPortalNotificationController::kNotificationMetric;
-const char* kUserActionMetric =
+const char* const kUserActionMetric =
     NetworkPortalNotificationController::kUserActionMetric;
 
 const char kTestUser[] = "test-user@gmail.com";
@@ -73,13 +73,13 @@ class TestObserver : public MessageCenterObserver {
   virtual void OnNotificationDisplayed(
       const std::string& notification_id,
       const message_center::DisplaySource source)
-      OVERRIDE {
+      override {
     if (notification_id == kNotificationId)
       MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure());
   }
 
   virtual void OnNotificationRemoved(const std::string& notification_id,
-                                     bool by_user) OVERRIDE {
+                                     bool by_user) override {
     if (notification_id == kNotificationId && by_user)
       MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure());
   }
@@ -100,7 +100,7 @@ class NetworkPortalDetectorImplBrowserTest
       : LoginManagerTest(false), network_portal_detector_(NULL) {}
   virtual ~NetworkPortalDetectorImplBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
 
     ShillServiceClient::TestInterface* service_test =