Linux: revive a mysteriously disabled test and add tests for the GNOME Keyring native backend.

chrome/browser/password_manager/password_store_x_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
+#include "base/file_util.h"
+#include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_data.h"
 #include "chrome/browser/password_manager/password_store_change.h"
+#include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/password_manager/password_store_x.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/signaling_task.h"
 #include "chrome/test/testing_profile.h"
+#include "content/common/notification_details.h"
 #include "content/common/notification_observer_mock.h"
-#include "content/common/notification_service.h"
+#include "content/common/notification_registrar.h"
+#include "content/common/notification_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
 using testing::_;
 using testing::DoAll;
 using testing::ElementsAreArray;
 using testing::Pointee;
 using testing::Property;
 using testing::WithArg;
@@ skipping 17 matching lines @@
 };
 
 // This class will add and remove a mock notification observer from
 // the DB thread.
 class DBThreadObserverHelper
     : public base::RefCountedThreadSafe<DBThreadObserverHelper,
                                         BrowserThread::DeleteOnDBThread> {
  public:
   DBThreadObserverHelper() : done_event_(true, false) {}
 
-  void Init() {
+  void Init(PasswordStore* password_store) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
-        NewRunnableMethod(this, &DBThreadObserverHelper::AddObserverTask));
+        NewRunnableMethod(this,
+                          &DBThreadObserverHelper::AddObserverTask,
+                          make_scoped_refptr(password_store)));
     done_event_.Wait();
   }
 
   virtual ~DBThreadObserverHelper() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     registrar_.RemoveAll();
   }
 
   NotificationObserverMock& observer() {
     return observer_;
   }
 
  protected:
   friend class base::RefCountedThreadSafe<DBThreadObserverHelper>;
 
-  void AddObserverTask() {
+  void AddObserverTask(PasswordStore* password_store) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     registrar_.Add(&observer_,
-                   chrome::LOGINS_CHANGED,
-                   NotificationService::AllSources());
+                   chrome::NOTIFICATION_LOGINS_CHANGED,
+                   Source<PasswordStore>(password_store));
     done_event_.Signal();
   }
 
   WaitableEvent done_event_;
   NotificationRegistrar registrar_;
   NotificationObserverMock observer_;
 };
 
 class FailingBackend : public PasswordStoreX::NativeBackend {
  public:
@@ skipping 257 matching lines @@
   // The WDS schedules tasks to run on the DB thread so we schedule yet another
   // task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   // Initializing the PasswordStore should trigger a migration.
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
-                           profile_.get(),
-                           wds_.get(),
-                           GetBackend()));
+                         profile_.get(),
+                         wds_.get(),
+                         GetBackend()));
   store->Init();
 
   // Check that the migration preference has not been initialized.
   ASSERT_TRUE(NULL == profile_->GetPrefs()->FindPreference(
       prefs::kLoginDatabaseMigrated));
 
   // Again, the WDS schedules tasks to run on the DB thread, so schedule a task
   // to signal us when it is safe to continue.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
@@ skipping 57 matching lines @@
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   // Handle the callback from the WDS.
   MessageLoop::current()->RunAllPending();
 
   STLDeleteElements(&expected_autofillable);
   STLDeleteElements(&expected_blacklisted);
 
-  store->Shutdown();
+  // Public in PasswordStore, protected in PasswordStoreX.
+  static_cast<PasswordStore*>(store)->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, WDSMigrationAlreadyDone) {
   PasswordFormData wds_data[] = {
     { PasswordForm::SCHEME_HTML,
       "http://bar.example.com",
       "http://bar.example.com/origin",
       "http://bar.example.com/action",
       L"submit_element",
       L"username_element",
@@ skipping 15 matching lines @@
     wds_->AddLogin(**it);
   }
 
   // The WDS schedules tasks to run on the DB thread so we schedule yet another
   // task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
-  // Prentend that the migration has already taken place.
+  // Pretend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                             true,
                                             PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
-                           profile_.get(),
-                           wds_.get(),
-                           GetBackend()));
+                         profile_.get(),
+                         wds_.get(),
+                         GetBackend()));
   store->Init();
 
   MockPasswordStoreConsumer consumer;
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnPasswordStoreRequestDone(_, _))
       .WillByDefault(QuitUIMessageLoop());
 
   // No forms should be migrated.
   VectorOfForms empty;
   EXPECT_CALL(consumer,
       OnPasswordStoreRequestDone(_,
           ContainsAllPasswordForms(empty)))
       .WillOnce(QuitUIMessageLoop());
 
   store->GetAutofillableLogins(&consumer);
   MessageLoop::current()->Run();
 
   STLDeleteElements(&unexpected_autofillable);
 
-  store->Shutdown();
+  // Public in PasswordStore, protected in PasswordStoreX.
+  static_cast<PasswordStore*>(store)->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, Notifications) {
   // Pretend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                             true,
                                             PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
-                           profile_.get(),
-                           wds_.get(),
-                           GetBackend()));
+                         profile_.get(),
+                         wds_.get(),
+                         GetBackend()));
   store->Init();
 
   PasswordFormData form_data =
   { PasswordForm::SCHEME_HTML,
     "http://bar.example.com",
     "http://bar.example.com/origin",
     "http://bar.example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"username_value",
     L"password_value",
     true, false, 1 };
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(form_data));
 
   scoped_refptr<DBThreadObserverHelper> helper = new DBThreadObserverHelper;
-  helper->Init();
+  helper->Init(store);
 
   const PasswordStoreChange expected_add_changes[] = {
     PasswordStoreChange(PasswordStoreChange::ADD, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(int(chrome::LOGINS_CHANGED),
-                      NotificationService::AllSources(),
+              Observe(int(chrome::NOTIFICATION_LOGINS_CHANGED),
+                      Source<PasswordStore>(store),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_add_changes)))));
 
   // Adding a login should trigger a notification.
   store->AddLogin(*form);
 
   // The PasswordStore schedules tasks to run on the DB thread so we schedule
   // yet another task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   // Change the password.
   form->password_value = WideToUTF16(L"a different password");
 
   const PasswordStoreChange expected_update_changes[] = {
     PasswordStoreChange(PasswordStoreChange::UPDATE, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(int(chrome::LOGINS_CHANGED),
-                      NotificationService::AllSources(),
+              Observe(int(chrome::NOTIFICATION_LOGINS_CHANGED),
+                      Source<PasswordStore>(store),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_update_changes)))));
 
   // Updating the login with the new password should trigger a notification.
   store->UpdateLogin(*form);
 
   // Wait for PasswordStore to send the notification.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   const PasswordStoreChange expected_delete_changes[] = {
     PasswordStoreChange(PasswordStoreChange::REMOVE, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(int(chrome::LOGINS_CHANGED),
-                      NotificationService::AllSources(),
+              Observe(int(chrome::NOTIFICATION_LOGINS_CHANGED),
+                      Source<PasswordStore>(store),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_delete_changes)))));
 
   // Deleting the login should trigger a notification.
   store->RemoveLogin(*form);
 
   // Wait for PasswordStore to send the notification.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
-  store->Shutdown();
+  // Public in PasswordStore, protected in PasswordStoreX.
+  static_cast<PasswordStore*>(store)->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, NativeMigration) {
   VectorOfForms expected_autofillable;
   InitExpectedForms(true, 50, &expected_autofillable);
 
   VectorOfForms expected_blacklisted;
   InitExpectedForms(false, 50, &expected_blacklisted);
 
   // Get the initial size of the login DB file, before we populate it.
@@ skipping 35 matching lines @@
   EXPECT_GT(db_file_full_info.size, db_file_start_info.size);
 
   // Pretend that the WDS migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                             true,
                                             PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a native migration (yet).
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
-                           profile_.get(),
-                           wds_.get(),
-                           GetBackend()));
+                         profile_.get(),
+                         wds_.get(),
+                         GetBackend()));
   store->Init();
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnPasswordStoreRequestDone(_, _))
       .WillByDefault(QuitUIMessageLoop());
 
   // The autofillable forms should have been migrated to the native backend.
   EXPECT_CALL(consumer,
@@ skipping 63 matching lines @@
     // size is equal to the size before we populated it, even though it was
     // larger after populating it.
     base::PlatformFileInfo db_file_end_info;
     ASSERT_TRUE(file_util::GetFileInfo(login_db_file, &db_file_end_info));
     EXPECT_EQ(db_file_start_info.size, db_file_end_info.size);
   }
 
   STLDeleteElements(&expected_autofillable);
   STLDeleteElements(&expected_blacklisted);
 
-  store->Shutdown();
+  // Public in PasswordStore, protected in PasswordStoreX.
+  static_cast<PasswordStore*>(store)->Shutdown();
 }
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));