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

Side by Side Diff: chrome/browser/prefs/tracked/pref_hash_browsertest.cc

Issue 2782803002: Move tracked prefs into services/preferences/tracked. (Closed)
Patch Set: rebase Created 3 years, 8 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/prefs/profile_pref_store_manager.h" 26 #include "chrome/browser/prefs/profile_pref_store_manager.h"
27 #include "chrome/browser/prefs/session_startup_pref.h" 27 #include "chrome/browser/prefs/session_startup_pref.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ui/browser.h" 29 #include "chrome/browser/ui/browser.h"
30 #include "chrome/common/chrome_constants.h" 30 #include "chrome/common/chrome_constants.h"
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
33 #include "chrome/test/base/testing_profile.h" 33 #include "chrome/test/base/testing_profile.h"
34 #include "components/search_engines/default_search_manager.h" 34 #include "components/search_engines/default_search_manager.h"
35 #include "components/search_engines/template_url_data.h" 35 #include "components/search_engines/template_url_data.h"
36 #include "components/user_prefs/tracked/tracked_preference_histogram_names.h"
37 #include "extensions/browser/pref_names.h" 36 #include "extensions/browser/pref_names.h"
38 #include "extensions/common/extension.h" 37 #include "extensions/common/extension.h"
38 #include "services/preferences/public/cpp/tracked/tracked_preference_histogram_n ames.h"
39 39
40 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
41 #include "chromeos/chromeos_switches.h" 41 #include "chromeos/chromeos_switches.h"
42 #endif 42 #endif
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "base/test/test_reg_util_win.h" 45 #include "base/test/test_reg_util_win.h"
46 #endif 46 #endif
47 47
48 namespace { 48 namespace {
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, dse_source); 1271 EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, dse_source);
1272 EXPECT_NE(current_dse->keyword(), base::UTF8ToUTF16("badkeyword")); 1272 EXPECT_NE(current_dse->keyword(), base::UTF8ToUTF16("badkeyword"));
1273 EXPECT_NE(current_dse->short_name(), base::UTF8ToUTF16("badname")); 1273 EXPECT_NE(current_dse->short_name(), base::UTF8ToUTF16("badname"));
1274 EXPECT_NE(current_dse->url(), 1274 EXPECT_NE(current_dse->url(),
1275 "http://bad_default_engine/search?q=dirty_user_query"); 1275 "http://bad_default_engine/search?q=dirty_user_query");
1276 } 1276 }
1277 } 1277 }
1278 }; 1278 };
1279 1279
1280 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestDefaultSearch, SearchProtected); 1280 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestDefaultSearch, SearchProtected);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698