Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / passwords / password_manager_presenter_unittest.cc

diff --git a/src/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc b/src/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
index 1cee309..3386881 100644 (file)
--- a/src/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
+++ b/src/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
@@ -23,9 +23,9 @@ class MockPasswordUIView : public PasswordUIView {
     password_manager_presenter_.Initialize();
   }
   virtual ~MockPasswordUIView() {}
-  virtual Profile* GetProfile() OVERRIDE;
+  virtual Profile* GetProfile() override;
 #if !defined(OS_ANDROID)
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
+  virtual gfx::NativeWindow GetNativeWindow() const override;
 #endif
   MOCK_METHOD2(ShowPassword, void(size_t, const base::string16&));
   MOCK_METHOD2(SetPasswordList,
@@ -44,7 +44,7 @@ class MockPasswordUIView : public PasswordUIView {
 };
 
 #if !defined(OS_ANDROID)
-gfx::NativeWindow MockPasswordUIView::GetNativeWindow() { return NULL; }
+gfx::NativeWindow MockPasswordUIView::GetNativeWindow() const { return NULL; }
 #endif
 Profile* MockPasswordUIView::GetProfile() { return profile_; }
 
@@ -52,8 +52,8 @@ class PasswordManagerPresenterTest : public testing::Test {
  protected:
   PasswordManagerPresenterTest() {}
 
-  virtual ~PasswordManagerPresenterTest() {}
-  virtual void SetUp() OVERRIDE {
+  ~PasswordManagerPresenterTest() override {}
+  void SetUp() override {
     PasswordStoreFactory::GetInstance()->SetTestingFactory(
         &profile_, MockPasswordStoreService::Build);
     mock_controller_.reset(new MockPasswordUIView(&profile_));