chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/chromeos/net/network_portal_detector_impl_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

« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator.cc ('k') | chrome/browser/chromeos/net/network_portal_notification_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/macros.h"	7 #include "base/macros.h"

8 #include "base/message_loop/message_loop.h"	8 #include "base/message_loop/message_loop.h"

9 #include "base/prefs/pref_service.h"

10 #include "base/run_loop.h"	9 #include "base/run_loop.h"

11 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

12 #include "chrome/browser/chromeos/login/login_manager_test.h"	11 #include "chrome/browser/chromeos/login/login_manager_test.h"

13 #include "chrome/browser/chromeos/login/startup_utils.h"	12 #include "chrome/browser/chromeos/login/startup_utils.h"

14 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"	13 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"

15 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"	14 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"

16 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"	15 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

20 #include "chromeos/chromeos_switches.h"	19 #include "chromeos/chromeos_switches.h"

21 #include "chromeos/dbus/dbus_thread_manager.h"	20 #include "chromeos/dbus/dbus_thread_manager.h"

22 #include "chromeos/dbus/shill_service_client.h"	21 #include "chromeos/dbus/shill_service_client.h"

23 #include "chromeos/network/portal_detector/network_portal_detector.h"	22 #include "chromeos/network/portal_detector/network_portal_detector.h"

24 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"	23 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"

25 #include "components/captive_portal/captive_portal_testing_utils.h"	24 #include "components/captive_portal/captive_portal_testing_utils.h"

	25 #include "components/prefs/pref_service.h"

26 #include "components/syncable_prefs/pref_service_syncable.h"	26 #include "components/syncable_prefs/pref_service_syncable.h"

27 #include "content/public/test/test_utils.h"	27 #include "content/public/test/test_utils.h"

28 #include "dbus/object_path.h"	28 #include "dbus/object_path.h"

29 #include "net/base/net_errors.h"	29 #include "net/base/net_errors.h"

30 #include "testing/gtest/include/gtest/gtest.h"	30 #include "testing/gtest/include/gtest/gtest.h"

31 #include "third_party/cros_system_api/dbus/service_constants.h"	31 #include "third_party/cros_system_api/dbus/service_constants.h"

32 #include "ui/message_center/message_center.h"	32 #include "ui/message_center/message_center.h"

33 #include "ui/message_center/message_center_observer.h"	33 #include "ui/message_center/message_center_observer.h"

34	34

35 using base::MessageLoop;	35 using base::MessageLoop;

(...skipping 261 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
297 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy,	297 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy,

298 TestWithPreference) {	298 TestWithPreference) {

299 TestImpl(GetParam());	299 TestImpl(GetParam());

300 }	300 }

301	301

302 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy,	302 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy,

303 NetworkPortalDetectorImplBrowserTestIgnoreProxy,	303 NetworkPortalDetectorImplBrowserTestIgnoreProxy,

304 testing::Bool());	304 testing::Bool());

305	305

306 } // namespace chromeos	306 } // namespace chromeos

OLD	NEW