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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/prefs/json_pref_store.h" 12 #include "base/prefs/json_pref_store.h"
13 #include "base/prefs/mock_pref_change_callback.h"
14 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_value_store.h"
13 #include "base/prefs/public/pref_change_registrar.h" 16 #include "base/prefs/public/pref_change_registrar.h"
14 #include "base/prefs/testing_pref_store.h" 17 #include "base/prefs/testing_pref_store.h"
15 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 19 #include "base/values.h"
17 #include "chrome/browser/policy/configuration_policy_pref_store.h" 20 #include "chrome/browser/policy/configuration_policy_pref_store.h"
18 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 21 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
19 #include "chrome/browser/prefs/browser_prefs.h" 22 #include "chrome/browser/prefs/browser_prefs.h"
20 #include "chrome/browser/prefs/command_line_pref_store.h" 23 #include "chrome/browser/prefs/command_line_pref_store.h"
21 #include "chrome/browser/prefs/mock_pref_change_callback.h"
22 #include "chrome/browser/prefs/pref_registry_simple.h"
23 #include "chrome/browser/prefs/pref_registry_syncable.h" 24 #include "chrome/browser/prefs/pref_registry_syncable.h"
24 #include "chrome/browser/prefs/pref_service_mock_builder.h" 25 #include "chrome/browser/prefs/pref_service_mock_builder.h"
25 #include "chrome/browser/prefs/pref_value_store.h"
26 #include "chrome/browser/prefs/scoped_user_pref_update.h" 26 #include "chrome/browser/prefs/scoped_user_pref_update.h"
27 #include "chrome/common/chrome_paths.h" 27 #include "chrome/common/chrome_paths.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 30 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
31 #include "chrome/test/base/testing_pref_service.h" 31 #include "chrome/test/base/testing_pref_service.h"
32 #include "chrome/test/base/testing_profile.h" 32 #include "chrome/test/base/testing_profile.h"
33 #include "content/public/test/test_browser_thread.h" 33 #include "content/public/test/test_browser_thread.h"
34 #include "content/public/test/web_contents_tester.h" 34 #include "content/public/test/web_contents_tester.h"
35 #include "testing/gmock/include/gmock/gmock.h" 35 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 const char kDefaultFont[] = "Times"; 502 const char kDefaultFont[] = "Times";
503 #elif defined(OS_CHROMEOS) 503 #elif defined(OS_CHROMEOS)
504 const char kDefaultFont[] = "Tinos"; 504 const char kDefaultFont[] = "Tinos";
505 #else 505 #else
506 const char kDefaultFont[] = "Times New Roman"; 506 const char kDefaultFont[] = "Times New Roman";
507 #endif 507 #endif
508 EXPECT_EQ(ASCIIToUTF16(kDefaultFont), 508 EXPECT_EQ(ASCIIToUTF16(kDefaultFont),
509 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); 509 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
510 EXPECT_TRUE(webkit_prefs.javascript_enabled); 510 EXPECT_TRUE(webkit_prefs.javascript_enabled);
511 } 511 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_syncable_builder.cc ('k') | chrome/browser/prefs/pref_value_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698