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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 99333002: Revert of Move ConfigurationPolicyProvider, etc. to components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/login/user.h" 8 #include "chrome/browser/chromeos/login/user.h"
9 #include "chrome/browser/chromeos/login/user_manager.h" 9 #include "chrome/browser/chromeos/login/user_manager.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
14 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/policy/browser_policy_connector.h" 16 #include "chrome/browser/policy/browser_policy_connector.h"
17 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
17 #include "chromeos/chromeos_switches.h" 18 #include "chromeos/chromeos_switches.h"
18 #include "chromeos/dbus/cryptohome_client.h" 19 #include "chromeos/dbus/cryptohome_client.h"
19 #include "chromeos/dbus/dbus_thread_manager.h" 20 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "chromeos/dbus/shill_device_client.h" 21 #include "chromeos/dbus/shill_device_client.h"
21 #include "chromeos/dbus/shill_manager_client.h" 22 #include "chromeos/dbus/shill_manager_client.h"
22 #include "chromeos/dbus/shill_profile_client.h" 23 #include "chromeos/dbus/shill_profile_client.h"
23 #include "chromeos/dbus/shill_service_client.h" 24 #include "chromeos/dbus/shill_service_client.h"
24 #include "chromeos/dbus/shill_stub_helper.h" 25 #include "chromeos/dbus/shill_stub_helper.h"
25 #include "chromeos/network/onc/onc_utils.h" 26 #include "chromeos/network/onc/onc_utils.h"
26 #include "components/onc/onc_constants.h" 27 #include "components/onc/onc_constants.h"
27 #include "components/policy/core/common/external_data_fetcher.h" 28 #include "components/policy/core/common/external_data_fetcher.h"
28 #include "components/policy/core/common/mock_configuration_policy_provider.h"
29 #include "components/policy/core/common/policy_map.h" 29 #include "components/policy/core/common/policy_map.h"
30 #include "components/policy/core/common/policy_types.h" 30 #include "components/policy/core/common/policy_types.h"
31 #include "policy/policy_constants.h" 31 #include "policy/policy_constants.h"
32 #include "third_party/cros_system_api/dbus/service_constants.h" 32 #include "third_party/cros_system_api/dbus/service_constants.h"
33 #else // !defined(OS_CHROMEOS) 33 #else // !defined(OS_CHROMEOS)
34 #include "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client.h" 34 #include "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client.h"
35 #include "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client_factory.h" 35 #include "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client_factory.h"
36 #include "components/wifi/wifi_service.h" 36 #include "components/wifi/wifi_service.h"
37 #endif // defined(OS_CHROMEOS) 37 #endif // defined(OS_CHROMEOS)
38 38
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 VerifyAndEncryptData) { 430 VerifyAndEncryptData) {
431 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; 431 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
432 } 432 }
433 433
434 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, 434 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
435 ExtensionNetworkingPrivateApiTest, 435 ExtensionNetworkingPrivateApiTest,
436 testing::Bool()); 436 testing::Bool());
437 437
438 } // namespace 438 } // namespace
439 439
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698