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

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

Issue 635573005: Cleanup: Better constify some strings in chrome/browser/{chromeos,extensions}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, nit Created 6 years, 1 month 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 14 matching lines...) Expand all
25 #include "components/feedback/tracing_manager.h" 25 #include "components/feedback/tracing_manager.h"
26 #include "components/user_manager/user_manager.h" 26 #include "components/user_manager/user_manager.h"
27 #include "content/public/test/test_utils.h" 27 #include "content/public/test/test_utils.h"
28 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
29 #include "ui/events/event_utils.h" 29 #include "ui/events/event_utils.h"
30 30
31 namespace chromeos { 31 namespace chromeos {
32 32
33 namespace { 33 namespace {
34 34
35 const char* kTestUsers[] = {"test-user1@gmail.com", "test-user2@gmail.com"}; 35 const char* const kTestUsers[] = {"test-user1@gmail.com",
36 "test-user2@gmail.com"};
36 37
37 } // namespace 38 } // namespace
38 39
39 class PreferencesTest : public LoginManagerTest { 40 class PreferencesTest : public LoginManagerTest {
40 public: 41 public:
41 PreferencesTest() 42 PreferencesTest()
42 : LoginManagerTest(true), 43 : LoginManagerTest(true),
43 input_settings_(NULL), 44 input_settings_(NULL),
44 keyboard_(NULL) {} 45 keyboard_(NULL) {}
45 46
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); 202 !prefs1->GetBoolean(prefs::kTapToClickEnabled));
202 CheckLocalStateCorrespondsToPrefs(prefs1); 203 CheckLocalStateCorrespondsToPrefs(prefs1);
203 204
204 // Switch user back. 205 // Switch user back.
205 user_manager->SwitchActiveUser(kTestUsers[0]); 206 user_manager->SwitchActiveUser(kTestUsers[0]);
206 CheckSettingsCorrespondToPrefs(prefs1); 207 CheckSettingsCorrespondToPrefs(prefs1);
207 CheckLocalStateCorrespondsToPrefs(prefs1); 208 CheckLocalStateCorrespondsToPrefs(prefs1);
208 } 209 }
209 210
210 } // namespace chromeos 211 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698