Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(997)

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 9999018: chrome/browser/chromeos/input_method/ refactoring [part 6 of 6] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, remove |should_hide_properties_| Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index d5c8cdb79a7327764981aad86c145485152f9f08..204e772f73e30156bf62b9da0a1262451e71fc5d 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
#include "chrome/browser/chromeos/cros/mock_library_loader.h"
#include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
+#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/login_status_consumer.h"
#include "chrome/browser/chromeos/login/user_manager.h"
@@ -129,6 +130,9 @@ class LoginUtilsTestBase : public TESTBASE,
// which is part of io_thread_state_.
DBusThreadManager::InitializeForTesting(&mock_dbus_thread_manager_);
+ input_method::InputMethodManager::InitializeForTesting(
+ &mock_input_method_manager_);
+
// Likewise, SessionManagerClient should also be initialized before
// io_thread_state_.
MockSessionManagerClient* session_managed_client =
@@ -363,6 +367,7 @@ class LoginUtilsTestBase : public TESTBASE,
scoped_ptr<IOThread> io_thread_state_;
MockDBusThreadManager mock_dbus_thread_manager_;
+ input_method::MockInputMethodManager mock_input_method_manager_;
TestURLFetcherFactory test_url_fetcher_factory_;
cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;

Powered by Google App Engine
This is Rietveld 408576698