OLD | NEW |
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 "chrome/browser/ui/webui/options/preferences_browsertest.h" | 5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <iostream> | 9 #include <iostream> |
10 #include <memory> | 10 #include <memory> |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "content/public/browser/web_contents.h" | 35 #include "content/public/browser/web_contents.h" |
36 #include "content/public/test/browser_test_utils.h" | 36 #include "content/public/test/browser_test_utils.h" |
37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
38 #include "url/gurl.h" | 38 #include "url/gurl.h" |
39 | 39 |
40 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
41 #include "base/strings/stringprintf.h" | 41 #include "base/strings/stringprintf.h" |
42 #include "chrome/browser/browser_process.h" | 42 #include "chrome/browser/browser_process.h" |
43 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 43 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
44 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 44 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
45 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" | |
46 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" | 45 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" |
47 #include "chrome/browser/chromeos/settings/cros_settings.h" | 46 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 47 #include "chrome/browser/chromeos/settings/stub_install_attributes.h" |
48 #include "chromeos/dbus/dbus_thread_manager.h" | 48 #include "chromeos/dbus/dbus_thread_manager.h" |
49 #include "chromeos/dbus/shill_profile_client.h" | 49 #include "chromeos/dbus/shill_profile_client.h" |
50 #include "chromeos/dbus/shill_service_client.h" | 50 #include "chromeos/dbus/shill_service_client.h" |
51 #include "chromeos/network/network_state.h" | 51 #include "chromeos/network/network_state.h" |
52 #include "chromeos/network/network_state_handler.h" | 52 #include "chromeos/network/network_state_handler.h" |
53 #include "chromeos/settings/cros_settings_names.h" | 53 #include "chromeos/settings/cros_settings_names.h" |
54 #include "components/proxy_config/proxy_config_dictionary.h" | 54 #include "components/proxy_config/proxy_config_dictionary.h" |
55 #include "content/public/test/test_utils.h" | 55 #include "content/public/test/test_utils.h" |
56 #include "third_party/cros_system_api/dbus/service_constants.h" | 56 #include "third_party/cros_system_api/dbus/service_constants.h" |
57 #endif | 57 #endif |
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
715 VerifyObservedPrefs(observed_json, pref_names_, | 715 VerifyObservedPrefs(observed_json, pref_names_, |
716 decorated_non_default_values.get(), | 716 decorated_non_default_values.get(), |
717 std::string(), false, false); | 717 std::string(), false, false); |
718 } | 718 } |
719 | 719 |
720 class ManagedPreferencesBrowserTest : public PreferencesBrowserTest { | 720 class ManagedPreferencesBrowserTest : public PreferencesBrowserTest { |
721 protected: | 721 protected: |
722 // PreferencesBrowserTest implementation: | 722 // PreferencesBrowserTest implementation: |
723 void SetUpInProcessBrowserTestFixture() override { | 723 void SetUpInProcessBrowserTestFixture() override { |
724 // Set up fake install attributes. | 724 // Set up fake install attributes. |
725 std::unique_ptr<policy::StubEnterpriseInstallAttributes> attributes( | 725 std::unique_ptr<chromeos::StubInstallAttributes> attributes = |
726 new policy::StubEnterpriseInstallAttributes()); | 726 base::MakeUnique<chromeos::StubInstallAttributes>(); |
727 attributes->SetDomain("example.com"); | 727 attributes->SetDomain("example.com"); |
728 attributes->SetRegistrationUser("user@example.com"); | 728 attributes->SetRegistrationUser("user@example.com"); |
729 policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting( | 729 policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting( |
730 attributes.release()); | 730 attributes.release()); |
731 | 731 |
732 PreferencesBrowserTest::SetUpInProcessBrowserTestFixture(); | 732 PreferencesBrowserTest::SetUpInProcessBrowserTestFixture(); |
733 } | 733 } |
734 }; | 734 }; |
735 | 735 |
736 // Verifies that initializing the JavaScript Preferences class fires the correct | 736 // Verifies that initializing the JavaScript Preferences class fires the correct |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1080 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); | 1080 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); |
1081 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); | 1081 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); |
1082 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); | 1082 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); |
1083 | 1083 |
1084 VerifyCurrentProxyServer( | 1084 VerifyCurrentProxyServer( |
1085 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", | 1085 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", |
1086 onc::ONC_SOURCE_NONE); | 1086 onc::ONC_SOURCE_NONE); |
1087 } | 1087 } |
1088 | 1088 |
1089 #endif | 1089 #endif |
OLD | NEW |