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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 #include <sys/types.h> 6 #include <sys/types.h>
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/prefs/pref_service.h"
13 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" 13 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
15 #include "chrome/browser/chromeos/login/login_manager_test.h" 14 #include "chrome/browser/chromeos/login/login_manager_test.h"
16 #include "chrome/browser/chromeos/login/startup_utils.h" 15 #include "chrome/browser/chromeos/login/startup_utils.h"
17 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 16 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
18 #include "chrome/browser/chromeos/preferences.h" 17 #include "chrome/browser/chromeos/preferences.h"
19 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
20 #include "chrome/browser/chromeos/settings/cros_settings.h" 19 #include "chrome/browser/chromeos/settings/cros_settings.h"
21 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" 20 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
22 #include "chrome/browser/chromeos/system/fake_input_device_settings.h" 21 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
23 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 22 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
24 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
25 #include "chromeos/chromeos_switches.h" 24 #include "chromeos/chromeos_switches.h"
26 #include "components/feedback/tracing_manager.h" 25 #include "components/feedback/tracing_manager.h"
26 #include "components/prefs/pref_service.h"
27 #include "components/user_manager/user_manager.h" 27 #include "components/user_manager/user_manager.h"
28 #include "content/public/test/test_utils.h" 28 #include "content/public/test/test_utils.h"
29 #include "testing/gtest/include/gtest/gtest.h" 29 #include "testing/gtest/include/gtest/gtest.h"
30 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" 30 #include "ui/base/ime/chromeos/fake_ime_keyboard.h"
31 #include "ui/events/event_utils.h" 31 #include "ui/events/event_utils.h"
32 32
33 namespace chromeos { 33 namespace chromeos {
34 34
35 namespace { 35 namespace {
36 36
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); 208 !prefs1->GetBoolean(prefs::kTapToClickEnabled));
209 CheckLocalStateCorrespondsToPrefs(prefs1); 209 CheckLocalStateCorrespondsToPrefs(prefs1);
210 210
211 // Switch user back. 211 // Switch user back.
212 user_manager->SwitchActiveUser(test_users_[0]); 212 user_manager->SwitchActiveUser(test_users_[0]);
213 CheckSettingsCorrespondToPrefs(prefs1); 213 CheckSettingsCorrespondToPrefs(prefs1);
214 CheckLocalStateCorrespondsToPrefs(prefs1); 214 CheckLocalStateCorrespondsToPrefs(prefs1);
215 } 215 }
216 216
217 } // namespace chromeos 217 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698