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

Side by Side Diff: chrome/browser/prefs/tracked/pref_hash_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
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 <string> 5 #include <string>
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/json/json_file_value_serializer.h" 11 #include "base/json/json_file_value_serializer.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/metrics/histogram_base.h" 13 #include "base/metrics/histogram_base.h"
14 #include "base/metrics/histogram_samples.h" 14 #include "base/metrics/histogram_samples.h"
15 #include "base/metrics/statistics_recorder.h" 15 #include "base/metrics/statistics_recorder.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/pref_service.h"
18 #include "base/prefs/scoped_user_pref_update.h"
19 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
21 #include "base/values.h" 19 #include "base/values.h"
22 #include "build/build_config.h" 20 #include "build/build_config.h"
23 #include "chrome/browser/extensions/extension_browsertest.h" 21 #include "chrome/browser/extensions/extension_browsertest.h"
24 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 23 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
26 #include "chrome/browser/prefs/profile_pref_store_manager.h" 24 #include "chrome/browser/prefs/profile_pref_store_manager.h"
27 #include "chrome/browser/prefs/session_startup_pref.h" 25 #include "chrome/browser/prefs/session_startup_pref.h"
28 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ui/browser.h" 27 #include "chrome/browser/ui/browser.h"
30 #include "chrome/common/chrome_constants.h" 28 #include "chrome/common/chrome_constants.h"
31 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
33 #include "chrome/test/base/testing_profile.h" 31 #include "chrome/test/base/testing_profile.h"
32 #include "components/prefs/pref_service.h"
33 #include "components/prefs/scoped_user_pref_update.h"
34 #include "components/search_engines/default_search_manager.h" 34 #include "components/search_engines/default_search_manager.h"
35 #include "components/user_prefs/tracked/tracked_preference_histogram_names.h" 35 #include "components/user_prefs/tracked/tracked_preference_histogram_names.h"
36 #include "extensions/browser/pref_names.h" 36 #include "extensions/browser/pref_names.h"
37 #include "extensions/common/extension.h" 37 #include "extensions/common/extension.h"
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "chromeos/chromeos_switches.h" 40 #include "chromeos/chromeos_switches.h"
41 #endif 41 #endif
42 42
43 namespace { 43 namespace {
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 ALLOW_NONE)); 953 ALLOW_NONE));
954 EXPECT_EQ( 954 EXPECT_EQ(
955 0, GetTrackedPrefHistogramCount( 955 0, GetTrackedPrefHistogramCount(
956 user_prefs::tracked::kTrackedPrefHistogramMigratedLegacyDeviceId, 956 user_prefs::tracked::kTrackedPrefHistogramMigratedLegacyDeviceId,
957 ALLOW_NONE)); 957 ALLOW_NONE));
958 } 958 }
959 }; 959 };
960 960
961 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe, 961 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe,
962 UntrustedAdditionToPrefsAfterWipe); 962 UntrustedAdditionToPrefsAfterWipe);
OLDNEW
« no previous file with comments | « chrome/browser/prefs/session_startup_pref.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698