Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / password_manager / core / browser / password_manager_unittest.cc

diff --git a/src/components/password_manager/core/browser/password_manager_unittest.cc b/src/components/password_manager/core/browser/password_manager_unittest.cc
index 091b6c0..c2bb40c 100644 (file)
--- a/src/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/src/components/password_manager/core/browser/password_manager_unittest.cc
@@ -55,12 +55,12 @@ class MockPasswordManagerClient : public StubPasswordManagerClient {
 
   // Workaround for scoped_ptr<> lacking a copy constructor.
   virtual bool PromptUserToSavePassword(
-      scoped_ptr<PasswordFormManager> manager) OVERRIDE {
+      scoped_ptr<PasswordFormManager> manager) override {
     PromptUserToSavePasswordPtr(manager.release());
     return false;
   }
   virtual void AutomaticPasswordSave(
-      scoped_ptr<PasswordFormManager> manager) OVERRIDE {
+      scoped_ptr<PasswordFormManager> manager) override {
     AutomaticPasswordSavePtr(manager.release());
   }
 };
@@ -81,7 +81,7 @@ class TestPasswordManager : public PasswordManager {
  public:
   explicit TestPasswordManager(PasswordManagerClient* client)
       : PasswordManager(client) {}
-  virtual ~TestPasswordManager() {}
+  ~TestPasswordManager() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestPasswordManager);
@@ -91,13 +91,13 @@ class TestPasswordManager : public PasswordManager {
 
 class PasswordManagerTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
                                            true);
 
     store_ = new MockPasswordStore;
-    EXPECT_CALL(*store_.get(), ReportMetrics(_)).Times(AnyNumber());
-    CHECK(store_->Init(syncer::SyncableService::StartSyncFlare(), ""));
+    EXPECT_CALL(*store_.get(), ReportMetrics(_, _)).Times(AnyNumber());
+    CHECK(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
     EXPECT_CALL(client_, IsPasswordManagerEnabledForCurrentPage())
         .WillRepeatedly(Return(true));
@@ -120,7 +120,7 @@ class PasswordManagerTest : public testing::Test {
         .WillRepeatedly(Return(false));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     store_->Shutdown();
     store_ = NULL;
   }