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

Side by Side Diff: chrome/browser/extensions/api/preference/preference_apitest.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) 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 "base/location.h" 5 #include "base/location.h"
6 #include "base/prefs/pref_service.h"
7 #include "base/single_thread_task_runner.h" 6 #include "base/single_thread_task_runner.h"
8 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
9 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/extensions/extension_apitest.h" 12 #include "chrome/browser/extensions/extension_apitest.h"
14 #include "chrome/browser/net/prediction_options.h" 13 #include "chrome/browser/net/prediction_options.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
19 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
20 #include "components/autofill/core/common/autofill_pref_names.h" 19 #include "components/autofill/core/common/autofill_pref_names.h"
21 #include "components/content_settings/core/common/pref_names.h" 20 #include "components/content_settings/core/common/pref_names.h"
22 #include "components/password_manager/core/common/password_manager_pref_names.h" 21 #include "components/password_manager/core/common/password_manager_pref_names.h"
22 #include "components/prefs/pref_service.h"
23 #include "components/translate/core/common/translate_pref_names.h" 23 #include "components/translate/core/common/translate_pref_names.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/common/webrtc_ip_handling_policy.h" 25 #include "content/public/common/webrtc_ip_handling_policy.h"
26 #include "extensions/browser/extension_registry.h" 26 #include "extensions/browser/extension_registry.h"
27 #include "extensions/browser/test_extension_registry_observer.h" 27 #include "extensions/browser/test_extension_registry_observer.h"
28 #include "extensions/test/extension_test_message_listener.h" 28 #include "extensions/test/extension_test_message_listener.h"
29 #include "extensions/test/result_catcher.h" 29 #include "extensions/test/result_catcher.h"
30 30
31 namespace { 31 namespace {
32 32
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 347
348 #if defined(OS_WIN) // http://crbug.com/477844 348 #if defined(OS_WIN) // http://crbug.com/477844
349 #define MAYBE_DataReductionProxy DISABLED_DataReductionProxy 349 #define MAYBE_DataReductionProxy DISABLED_DataReductionProxy
350 #else 350 #else
351 #define MAYBE_DataReductionProxy DataReductionProxy 351 #define MAYBE_DataReductionProxy DataReductionProxy
352 #endif 352 #endif
353 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_DataReductionProxy) { 353 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_DataReductionProxy) {
354 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << 354 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) <<
355 message_; 355 message_;
356 } 356 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698