cros: More mocks out-of-lining, more build fixes & breakages

BUG=none
TEST=none
TBR=dpolukhin

Review URL: http://codereview.chromium.org/7032002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85439 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 37 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/cros/mock_library_loader.cc b/chrome/browser/chromeos/cros/mock_library_loader.cc
index 0f9cd06..e84ea031 100644
--- a/chrome/browser/chromeos/cros/mock_library_loader.cc
+++ b/chrome/browser/chromeos/cros/mock_library_loader.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/chromeos/cros/mock_library_loader.h"
+
 namespace chromeos {
 
 MockLibraryLoader::MockLibraryLoader() {}
diff --git a/chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h b/chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h
index ec846336..7effd19 100644
--- a/chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h
+++ b/chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_AUTH_ATTEMPT_STATE_RESOLVER_H_
 #pragma once
 
+#include "base/basictypes.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/chrome/browser/chromeos/login/mock_login_status_consumer.cc b/chrome/browser/chromeos/login/mock_login_status_consumer.cc
new file mode 100644
index 0000000..69bed67
--- /dev/null
+++ b/chrome/browser/chromeos/login/mock_login_status_consumer.cc
@@ -0,0 +1,13 @@
+// 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 "chrome/browser/chromeos/login/mock_login_status_consumer.h"
+
+namespace chromeos {
+
+MockConsumer::MockConsumer() {}
+
+MockConsumer::~MockConsumer() {}
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/mock_login_status_consumer.h b/chrome/browser/chromeos/login/mock_login_status_consumer.h
index a3dcd19..5cddb94 100644
--- a/chrome/browser/chromeos/login/mock_login_status_consumer.h
+++ b/chrome/browser/chromeos/login/mock_login_status_consumer.h
@@ -15,8 +15,9 @@ namespace chromeos {
 
 class MockConsumer : public LoginStatusConsumer {
  public:
-  MockConsumer() {}
-  ~MockConsumer() {}
+  MockConsumer();
+  virtual ~MockConsumer();
+
   MOCK_METHOD1(OnLoginFailure, void(const LoginFailure& error));
   MOCK_METHOD4(OnLoginSuccess, void(
       const std::string& username,
diff --git a/chrome/browser/chromeos/login/mock_user_manager.cc b/chrome/browser/chromeos/login/mock_user_manager.cc
new file mode 100644
index 0000000..901be88
--- /dev/null
+++ b/chrome/browser/chromeos/login/mock_user_manager.cc
@@ -0,0 +1,13 @@
+// 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 "chrome/browser/chromeos/login/mock_user_manager.h"
+
+namespace chromeos {
+
+MockUserManager::MockUserManager() {}
+
+MockUserManager::~MockUserManager() {}
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h
index 9208894..ce1fe84 100644
--- a/chrome/browser/chromeos/login/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/mock_user_manager.h
@@ -16,8 +16,8 @@ namespace chromeos {
 
 class MockUserManager : public UserManager {
  public:
-  MockUserManager() {}
-  virtual ~MockUserManager() {}
+  MockUserManager();
+  virtual ~MockUserManager();
 
   MOCK_CONST_METHOD0(GetUsers, std::vector<User>());
   MOCK_METHOD0(OffTheRecordUserLoggedIn, void());
diff --git a/chrome/browser/chromeos/mock_system_access.h b/chrome/browser/chromeos/mock_system_access.h
index 6862629..e4cf03a 100644
--- a/chrome/browser/chromeos/mock_system_access.h
+++ b/chrome/browser/chromeos/mock_system_access.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_MOCK_SYSTEM_ACCESS_H_
 #pragma once
 
+#include "base/basictypes.h"
 #include "chrome/browser/chromeos/system_access.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d86ff09..339ffed 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1271,9 +1271,11 @@
         'browser/chromeos/login/mock_auth_attempt_state_resolver.cc',
         'browser/chromeos/login/mock_auth_attempt_state_resolver.h',
         'browser/chromeos/login/mock_auth_response_handler.cc',
+        'browser/chromeos/login/mock_login_status_consumer.cc',
         'browser/chromeos/login/mock_login_status_consumer.h',
         'browser/chromeos/login/mock_url_fetchers.cc',
         'browser/chromeos/login/mock_url_fetchers.h',
+        'browser/chromeos/login/mock_user_manager.cc',
         'browser/chromeos/login/mock_user_manager.h',
         'browser/chromeos/login/online_attempt_unittest.cc',
         'browser/chromeos/login/owner_key_utils_unittest.cc',