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

Side by Side Diff: chrome/browser/chromeos/preferences_browsertest.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <sys/types.h> 5 #include <sys/types.h>
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 26 matching lines...) Expand all
37 37
38 } // namespace 38 } // namespace
39 39
40 class PreferencesTest : public LoginManagerTest { 40 class PreferencesTest : public LoginManagerTest {
41 public: 41 public:
42 PreferencesTest() 42 PreferencesTest()
43 : LoginManagerTest(true), 43 : LoginManagerTest(true),
44 input_settings_(NULL), 44 input_settings_(NULL),
45 keyboard_(NULL) {} 45 keyboard_(NULL) {}
46 46
47 virtual void SetUpCommandLine(CommandLine* command_line) override { 47 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
48 LoginManagerTest::SetUpCommandLine(command_line); 48 LoginManagerTest::SetUpCommandLine(command_line);
49 command_line->AppendSwitch(switches::kStubCrosSettings); 49 command_line->AppendSwitch(switches::kStubCrosSettings);
50 } 50 }
51 51
52 virtual void SetUpOnMainThread() override { 52 virtual void SetUpOnMainThread() override {
53 LoginManagerTest::SetUpOnMainThread(); 53 LoginManagerTest::SetUpOnMainThread();
54 input_settings_ = new system::FakeInputDeviceSettings(); 54 input_settings_ = new system::FakeInputDeviceSettings();
55 system::InputDeviceSettings::SetSettingsForTesting(input_settings_); 55 system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
56 keyboard_ = new input_method::FakeImeKeyboard(); 56 keyboard_ = new input_method::FakeImeKeyboard();
57 static_cast<input_method::InputMethodManagerImpl*>( 57 static_cast<input_method::InputMethodManagerImpl*>(
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); 202 !prefs1->GetBoolean(prefs::kTapToClickEnabled));
203 CheckLocalStateCorrespondsToPrefs(prefs1); 203 CheckLocalStateCorrespondsToPrefs(prefs1);
204 204
205 // Switch user back. 205 // Switch user back.
206 user_manager->SwitchActiveUser(kTestUsers[0]); 206 user_manager->SwitchActiveUser(kTestUsers[0]);
207 CheckSettingsCorrespondToPrefs(prefs1); 207 CheckSettingsCorrespondToPrefs(prefs1);
208 CheckLocalStateCorrespondsToPrefs(prefs1); 208 CheckLocalStateCorrespondsToPrefs(prefs1);
209 } 209 }
210 210
211 } // namespace chromeos 211 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/profiles/profile_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698