cros: Out-of-lining mocks, home stretch

BUG=none
TEST=none
TBR=dpolukhin

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

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

7 files changed, 43 insertions, 13 deletions

diff --git a/chrome/browser/chromeos/cros/mock_update_library.cc b/chrome/browser/chromeos/cros/mock_update_library.cc
new file mode 100644
index 0000000..2049969
--- /dev/null
+++ b/chrome/browser/chromeos/cros/mock_update_library.cc
@@ -0,0 +1,13 @@
+// Copyright (c) 2010 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/cros/mock_update_library.h"
+
+namespace chromeos {
+
+MockUpdateLibrary::MockUpdateLibrary() {}
+
+MockUpdateLibrary::~MockUpdateLibrary() {}
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/mock_update_library.h b/chrome/browser/chromeos/cros/mock_update_library.h
index 8abace9..f0317ab 100644
--- a/chrome/browser/chromeos/cros/mock_update_library.h
+++ b/chrome/browser/chromeos/cros/mock_update_library.h
@@ -14,8 +14,9 @@ namespace chromeos {
 
 class MockUpdateLibrary : public UpdateLibrary {
  public:
-  MockUpdateLibrary() {}
-  virtual ~MockUpdateLibrary() {}
+  MockUpdateLibrary();
+  virtual ~MockUpdateLibrary();
+
   MOCK_METHOD1(AddObserver, void(Observer*));  // NOLINT
   MOCK_METHOD1(RemoveObserver, void(Observer*));  // NOLINT
   MOCK_METHOD1(HasObserver, bool(Observer*));
diff --git a/chrome/browser/chromeos/login/mock_authenticator.cc b/chrome/browser/chromeos/login/mock_authenticator.cc
index a803093..c05608e 100644
--- a/chrome/browser/chromeos/login/mock_authenticator.cc
+++ b/chrome/browser/chromeos/login/mock_authenticator.cc
@@ -83,6 +83,14 @@ Authenticator* MockLoginUtils::CreateAuthenticator(
       consumer, expected_username_, expected_password_);
 }
 
+void MockLoginUtils:;SetBackgroundView(BackgroundView* background_view) {
+  background_view_ = background_view;
+}
+
+BackgroundView* MockLoginUtils::GetBackgroundView() {
+  return background_view_;
+}
+
 std::string MockLoginUtils::GetOffTheRecordCommandLine(
     const GURL& start_url,
     const CommandLine& base_command_line,
diff --git a/chrome/browser/chromeos/login/mock_authenticator.h b/chrome/browser/chromeos/login/mock_authenticator.h
index fc53760..0a5a3f0 100644
--- a/chrome/browser/chromeos/login/mock_authenticator.h
+++ b/chrome/browser/chromeos/login/mock_authenticator.h
@@ -100,13 +100,9 @@ class MockLoginUtils : public LoginUtils {
       Profile* profile,
       const GaiaAuthConsumer::ClientLoginResult& credentials) {}
 
-  void SetBackgroundView(BackgroundView* background_view) {
-    background_view_ = background_view;
-  }
+  virtual void SetBackgroundView(BackgroundView* background_view);
 
-  BackgroundView* GetBackgroundView() {
-    return background_view_;
-  }
+  virtual BackgroundView* GetBackgroundView();
 
   virtual std::string GetOffTheRecordCommandLine(
       const GURL& start_url,
diff --git a/chrome/browser/chromeos/login/mock_update_screen.cc b/chrome/browser/chromeos/login/mock_update_screen.cc
new file mode 100644
index 0000000..dfd530f
--- /dev/null
+++ b/chrome/browser/chromeos/login/mock_update_screen.cc
@@ -0,0 +1,9 @@
+// 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_update_screen.h"
+
+MockUpdateScreen::MockUpdateScreen(WizardScreenDelegate* d)
+    : chromeos::UpdateScreen(d) {
+}
diff --git a/chrome/browser/chromeos/login/mock_update_screen.h b/chrome/browser/chromeos/login/mock_update_screen.h
index ad34cb8..ce80e68 100644
--- a/chrome/browser/chromeos/login/mock_update_screen.h
+++ b/chrome/browser/chromeos/login/mock_update_screen.h
@@ -12,9 +12,8 @@
 
 class MockUpdateScreen : public chromeos::UpdateScreen {
  public:
-  explicit MockUpdateScreen(WizardScreenDelegate* d)
-      : chromeos::UpdateScreen(d) {
-  }
+  explicit MockUpdateScreen(WizardScreenDelegate* d);
+
   MOCK_METHOD0(StartUpdate, void());
 };
 
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 81b3f6e..0ba331c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2250,17 +2250,21 @@
         'browser/chromeos/cros/mock_power_library.h',
         'browser/chromeos/cros/mock_screen_lock_library.cc',
         'browser/chromeos/cros/mock_screen_lock_library.h',
-        'browser/chromeos/cros/mock_screen_observer.cc',
-        'browser/chromeos/cros/mock_screen_observer.h',
         'browser/chromeos/cros/mock_speech_synthesis_library.cc',
         'browser/chromeos/cros/mock_speech_synthesis_library.h',
         'browser/chromeos/cros/mock_touchpad_library.cc',
         'browser/chromeos/cros/mock_touchpad_library.h',
+        'browser/chromeos/cros/mock_update_library.cc',
+        'browser/chromeos/cros/mock_update_library.h',
         'browser/chromeos/login/enterprise_enrollment_screen_browsertest.cc',
         'browser/chromeos/login/existing_user_controller_browsertest.cc',
         'browser/chromeos/login/login_browsertest.cc',
         'browser/chromeos/login/mock_authenticator.cc',
         'browser/chromeos/login/mock_authenticator.h',
+        'browser/chromeos/login/mock_screen_observer.cc',
+        'browser/chromeos/login/mock_screen_observer.h',
+        'browser/chromeos/login/mock_update_screen.cc',
+        'browser/chromeos/login/mock_update_screen.h',
         'browser/chromeos/login/network_screen_browsertest.cc',
         'browser/chromeos/login/screen_locker_browsertest.cc',
         'browser/chromeos/login/screen_locker_tester.cc',