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

Side by Side Diff: chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 1 month 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/login/login_manager_test.h" 13 #include "chrome/browser/chromeos/login/login_manager_test.h"
14 #include "chrome/browser/chromeos/login/startup_utils.h" 14 #include "chrome/browser/chromeos/login/startup_utils.h"
15 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 15 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
16 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h" 16 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
17 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" 17 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "chromeos/chromeos_switches.h" 21 #include "chromeos/chromeos_switches.h"
22 #include "chromeos/dbus/dbus_thread_manager.h" 22 #include "chromeos/dbus/dbus_thread_manager.h"
23 #include "chromeos/dbus/shill_service_client.h" 23 #include "chromeos/dbus/shill_service_client.h"
24 #include "chromeos/network/portal_detector/network_portal_detector.h" 24 #include "chromeos/network/portal_detector/network_portal_detector.h"
25 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 25 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
26 #include "components/captive_portal/captive_portal_testing_utils.h" 26 #include "components/captive_portal/captive_portal_testing_utils.h"
27 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
28 #include "components/syncable_prefs/pref_service_syncable.h" 28 #include "components/sync_preferences/pref_service_syncable.h"
29 #include "content/public/test/test_utils.h" 29 #include "content/public/test/test_utils.h"
30 #include "dbus/object_path.h" 30 #include "dbus/object_path.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 #include "third_party/cros_system_api/dbus/service_constants.h" 33 #include "third_party/cros_system_api/dbus/service_constants.h"
34 #include "ui/message_center/message_center.h" 34 #include "ui/message_center/message_center.h"
35 #include "ui/message_center/message_center_observer.h" 35 #include "ui/message_center/message_center_observer.h"
36 36
37 using message_center::MessageCenter; 37 using message_center::MessageCenter;
38 using message_center::MessageCenterObserver; 38 using message_center::MessageCenterObserver;
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy, 302 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy,
303 TestWithPreference) { 303 TestWithPreference) {
304 TestImpl(GetParam()); 304 TestImpl(GetParam());
305 } 305 }
306 306
307 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy, 307 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy,
308 NetworkPortalDetectorImplBrowserTestIgnoreProxy, 308 NetworkPortalDetectorImplBrowserTestIgnoreProxy,
309 testing::Bool()); 309 testing::Bool());
310 310
311 } // namespace chromeos 311 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698