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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_unittest.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/prefs/scoped_user_pref_update.h"
12 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 11 #include "base/values.h"
14 #include "build/build_config.h" 12 #include "build/build_config.h"
15 #include "chrome/browser/prefs/browser_prefs.h" 13 #include "chrome/browser/prefs/browser_prefs.h"
16 #include "chrome/browser/prefs/command_line_pref_store.h" 14 #include "chrome/browser/prefs/command_line_pref_store.h"
17 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 18 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
21 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
22 #include "components/policy/core/browser/configuration_policy_pref_store.h" 20 #include "components/policy/core/browser/configuration_policy_pref_store.h"
23 #include "components/policy/core/common/mock_configuration_policy_provider.h" 21 #include "components/policy/core/common/mock_configuration_policy_provider.h"
24 #include "components/pref_registry/pref_registry_syncable.h" 22 #include "components/pref_registry/pref_registry_syncable.h"
23 #include "components/prefs/pref_registry_simple.h"
24 #include "components/prefs/scoped_user_pref_update.h"
25 #include "components/syncable_prefs/pref_service_mock_factory.h" 25 #include "components/syncable_prefs/pref_service_mock_factory.h"
26 #include "components/syncable_prefs/testing_pref_service_syncable.h" 26 #include "components/syncable_prefs/testing_pref_service_syncable.h"
27 #include "content/public/common/web_preferences.h" 27 #include "content/public/common/web_preferences.h"
28 #include "content/public/test/test_renderer_host.h" 28 #include "content/public/test/test_renderer_host.h"
29 #include "ui/base/test/data/resource.h" 29 #include "ui/base/test/data/resource.h"
30 30
31 using content::RenderViewHostTester; 31 using content::RenderViewHostTester;
32 using content::WebPreferences; 32 using content::WebPreferences;
33 33
34 TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) { 34 TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 const char kDefaultFont[] = "Times"; 131 const char kDefaultFont[] = "Times";
132 #elif defined(OS_CHROMEOS) 132 #elif defined(OS_CHROMEOS)
133 const char kDefaultFont[] = "Tinos"; 133 const char kDefaultFont[] = "Tinos";
134 #else 134 #else
135 const char kDefaultFont[] = "Times New Roman"; 135 const char kDefaultFont[] = "Times New Roman";
136 #endif 136 #endif
137 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont), 137 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont),
138 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); 138 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
139 EXPECT_TRUE(webkit_prefs.javascript_enabled); 139 EXPECT_TRUE(webkit_prefs.javascript_enabled);
140 } 140 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_factory.cc ('k') | chrome/browser/prefs/command_line_pref_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698