OLD | NEW |
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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "chrome/browser/chromeos/login/users/user.h" | |
13 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" | 12 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" |
14 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" | 13 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" |
15 #include "chrome/browser/chromeos/settings/cros_settings.h" | 14 #include "chrome/browser/chromeos/settings/cros_settings.h" |
16 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 15 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
17 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" | 16 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" |
18 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
19 #include "chromeos/network/fake_network_device_handler.h" | 18 #include "chromeos/network/fake_network_device_handler.h" |
20 #include "chromeos/network/mock_managed_network_configuration_handler.h" | 19 #include "chromeos/network/mock_managed_network_configuration_handler.h" |
21 #include "chromeos/network/onc/mock_certificate_importer.h" | 20 #include "chromeos/network/onc/mock_certificate_importer.h" |
22 #include "chromeos/network/onc/onc_test_utils.h" | 21 #include "chromeos/network/onc/onc_test_utils.h" |
23 #include "chromeos/network/onc/onc_utils.h" | 22 #include "chromeos/network/onc/onc_utils.h" |
24 #include "components/onc/onc_constants.h" | 23 #include "components/onc/onc_constants.h" |
25 #include "components/policy/core/common/external_data_fetcher.h" | 24 #include "components/policy/core/common/external_data_fetcher.h" |
26 #include "components/policy/core/common/mock_configuration_policy_provider.h" | 25 #include "components/policy/core/common/mock_configuration_policy_provider.h" |
27 #include "components/policy/core/common/policy_map.h" | 26 #include "components/policy/core/common/policy_map.h" |
28 #include "components/policy/core/common/policy_service_impl.h" | 27 #include "components/policy/core/common/policy_service_impl.h" |
| 28 #include "components/user_manager/user.h" |
29 #include "components/user_manager/user_type.h" | 29 #include "components/user_manager/user_type.h" |
30 #include "content/public/test/test_browser_thread_bundle.h" | 30 #include "content/public/test/test_browser_thread_bundle.h" |
31 #include "content/public/test/test_utils.h" | 31 #include "content/public/test/test_utils.h" |
32 #include "net/base/test_data_directory.h" | 32 #include "net/base/test_data_directory.h" |
33 #include "net/cert/x509_certificate.h" | 33 #include "net/cert/x509_certificate.h" |
34 #include "net/test/cert_test_util.h" | 34 #include "net/test/cert_test_util.h" |
35 #include "policy/policy_constants.h" | 35 #include "policy/policy_constants.h" |
36 #include "testing/gmock/include/gmock/gmock.h" | 36 #include "testing/gmock/include/gmock/gmock.h" |
37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
38 | 38 |
39 using testing::AnyNumber; | 39 using testing::AnyNumber; |
40 using testing::AtLeast; | 40 using testing::AtLeast; |
41 using testing::Mock; | 41 using testing::Mock; |
42 using testing::Ne; | 42 using testing::Ne; |
43 using testing::Return; | 43 using testing::Return; |
44 using testing::StrictMock; | 44 using testing::StrictMock; |
45 using testing::_; | 45 using testing::_; |
46 | 46 |
47 namespace policy { | 47 namespace policy { |
48 | 48 |
49 namespace { | 49 namespace { |
50 | 50 |
51 const char kFakeUserEmail[] = "fake email"; | 51 const char kFakeUserEmail[] = "fake email"; |
52 const char kFakeUsernameHash[] = "fake hash"; | 52 const char kFakeUsernameHash[] = "fake hash"; |
53 | 53 |
54 class FakeUser : public chromeos::User { | 54 class FakeUser : public user_manager::User { |
55 public: | 55 public: |
56 FakeUser() : User(kFakeUserEmail) { | 56 FakeUser() : User(kFakeUserEmail) { |
57 set_display_email(kFakeUserEmail); | 57 set_display_email(kFakeUserEmail); |
58 set_username_hash(kFakeUsernameHash); | 58 set_username_hash(kFakeUsernameHash); |
59 } | 59 } |
60 virtual ~FakeUser() {} | 60 virtual ~FakeUser() {} |
61 | 61 |
62 // User overrides | 62 // User overrides |
63 virtual user_manager::UserType GetType() const OVERRIDE { | 63 virtual user_manager::UserType GetType() const OVERRIDE { |
64 return user_manager::USER_TYPE_REGULAR; | 64 return user_manager::USER_TYPE_REGULAR; |
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
655 policy.Erase(GetParam()); | 655 policy.Erase(GetParam()); |
656 UpdateProviderPolicy(policy); | 656 UpdateProviderPolicy(policy); |
657 } | 657 } |
658 | 658 |
659 INSTANTIATE_TEST_CASE_P(NetworkConfigurationUpdaterTestWithParamInstance, | 659 INSTANTIATE_TEST_CASE_P(NetworkConfigurationUpdaterTestWithParamInstance, |
660 NetworkConfigurationUpdaterTestWithParam, | 660 NetworkConfigurationUpdaterTestWithParam, |
661 testing::Values(key::kDeviceOpenNetworkConfiguration, | 661 testing::Values(key::kDeviceOpenNetworkConfiguration, |
662 key::kOpenNetworkConfiguration)); | 662 key::kOpenNetworkConfiguration)); |
663 | 663 |
664 } // namespace policy | 664 } // namespace policy |
OLD | NEW |