Investigate Android build problems in review 1414463004.

chrome/browser/password_manager/password_store_x_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
@@ skipping 31 matching lines @@
  public:
   MOCK_METHOD1(OnGetPasswordStoreResultsConstRef,
                void(const std::vector<PasswordForm*>&));
 
   // GMock cannot mock methods with move-only args.
   void OnGetPasswordStoreResults(ScopedVector<PasswordForm> results) override {
     OnGetPasswordStoreResultsConstRef(results.get());
   }
 };
 
-class MockPasswordStoreObserver
-    : public password_manager::PasswordStore::Observer {
- public:
-  MOCK_METHOD1(OnLoginsChanged,
-               void(const password_manager::PasswordStoreChangeList& changes));
-};
-
 class FailingBackend : public PasswordStoreX::NativeBackend {
  public:
   bool Init() override { return true; }
 
   PasswordStoreChangeList AddLogin(const PasswordForm& form) override {
     return PasswordStoreChangeList();
   }
   bool UpdateLogin(const PasswordForm& form,
                    PasswordStoreChangeList* changes) override {
     return false;
@@ skipping 248 matching lines @@
   password_manager::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 =
       CreatePasswordFormFromDataForTesting(form_data);
 
-  MockPasswordStoreObserver observer;
+  password_manager::MockPasswordStoreObserver observer;
   store->AddObserver(&observer);
 
   const PasswordStoreChange expected_add_changes[] = {
     PasswordStoreChange(PasswordStoreChange::ADD, *form),
   };
 
   EXPECT_CALL(
       observer,
       OnLoginsChanged(ElementsAreArray(expected_add_changes)));
 
@@ skipping 145 matching lines @@
 
 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));