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

Unified Diff: chrome/browser/chromeos/preferences_chromeos_browsertest.cc

Issue 2006083002: Use fake Input Device Settings with chrome://device-emulator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DevicePageTestsFixes
Patch Set: make dependent on a11y fix Created 4 years, 5 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
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences_chromeos_browsertest.cc
diff --git a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
index 16d0d07b3eb25d7dfbd3582f96e13c469136460e..93812b0559b4ab1794188d9861f11a55fa15f11d 100644
--- a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
@@ -42,7 +42,7 @@ const char* const kTestUsers[] = {"test-user1@gmail.com",
class PreferencesTest : public LoginManagerTest {
public:
PreferencesTest()
- : LoginManagerTest(true), input_settings_(NULL), keyboard_(NULL) {
+ : LoginManagerTest(true), input_settings_(nullptr), keyboard_(nullptr) {
for (size_t i = 0; i < arraysize(kTestUsers); ++i) {
test_users_.push_back(AccountId::FromUserEmail(kTestUsers[i]));
}
@@ -55,8 +55,8 @@ class PreferencesTest : public LoginManagerTest {
void SetUpOnMainThread() override {
LoginManagerTest::SetUpOnMainThread();
- input_settings_ = new system::FakeInputDeviceSettings();
- system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
+ input_settings_ = system::InputDeviceSettings::Get()->GetFakeInterface();
+ EXPECT_NE(nullptr, input_settings_);
keyboard_ = new input_method::FakeImeKeyboard();
static_cast<input_method::InputMethodManagerImpl*>(
input_method::InputMethodManager::Get())
@@ -135,7 +135,7 @@ class PreferencesTest : public LoginManagerTest {
std::vector<AccountId> test_users_;
private:
- system::FakeInputDeviceSettings* input_settings_;
+ system::InputDeviceSettings::FakeInterface* input_settings_;
input_method::FakeImeKeyboard* keyboard_;
DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698