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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_unittest.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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 | Annotate | Revision Log
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/file_util.h" 6 #include "base/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" 10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/policy/configuration_policy_pref_store.h" 13 #include "chrome/browser/policy/configuration_policy_pref_store.h"
14 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 14 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
15 #include "chrome/browser/prefs/browser_prefs.h" 15 #include "chrome/browser/prefs/browser_prefs.h"
16 #include "chrome/browser/prefs/command_line_pref_store.h" 16 #include "chrome/browser/prefs/command_line_pref_store.h"
17 #include "chrome/browser/prefs/pref_registry_syncable.h"
18 #include "chrome/browser/prefs/pref_service_mock_builder.h" 17 #include "chrome/browser/prefs/pref_service_mock_builder.h"
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" 18 #include "chrome/browser/prefs/scoped_user_pref_update.h"
20 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 22 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
24 #include "chrome/test/base/testing_pref_service_syncable.h" 23 #include "chrome/test/base/testing_pref_service_syncable.h"
25 #include "chrome/test/base/testing_profile.h" 24 #include "chrome/test/base/testing_profile.h"
25 #include "components/user_prefs/pref_registry_syncable.h"
26 #include "content/public/test/test_browser_thread.h" 26 #include "content/public/test/test_browser_thread.h"
27 #include "content/public/test/web_contents_tester.h" 27 #include "content/public/test/web_contents_tester.h"
28 #include "ui/base/test/data/resource.h" 28 #include "ui/base/test/data/resource.h"
29 #include "webkit/glue/webpreferences.h" 29 #include "webkit/glue/webpreferences.h"
30 30
31 using content::BrowserThread; 31 using content::BrowserThread;
32 using content::WebContentsTester; 32 using content::WebContentsTester;
33 33
34 TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) { 34 TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) {
35 TestingPrefServiceSimple prefs; 35 TestingPrefServiceSimple prefs;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 const char kDefaultFont[] = "Times"; 191 const char kDefaultFont[] = "Times";
192 #elif defined(OS_CHROMEOS) 192 #elif defined(OS_CHROMEOS)
193 const char kDefaultFont[] = "Tinos"; 193 const char kDefaultFont[] = "Tinos";
194 #else 194 #else
195 const char kDefaultFont[] = "Times New Roman"; 195 const char kDefaultFont[] = "Times New Roman";
196 #endif 196 #endif
197 EXPECT_EQ(ASCIIToUTF16(kDefaultFont), 197 EXPECT_EQ(ASCIIToUTF16(kDefaultFont),
198 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); 198 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
199 EXPECT_TRUE(webkit_prefs.javascript_enabled); 199 EXPECT_TRUE(webkit_prefs.javascript_enabled);
200 } 200 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698