| 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/memory/ptr_util.h" | 5 #include "base/memory/ptr_util.h" |
| 6 #include "base/values.h" | 6 #include "base/values.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" | 9 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" |
| 10 #include "components/policy/core/browser/browser_policy_connector.h" | 10 #include "components/policy/core/browser/browser_policy_connector.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 } | 46 } |
| 47 | 47 |
| 48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
| 49 void LoadONCPolicy(const std::string& filename) { | 49 void LoadONCPolicy(const std::string& filename) { |
| 50 const std::string& user_policy_blob = | 50 const std::string& user_policy_blob = |
| 51 chromeos::onc::test_utils::ReadTestData(filename); | 51 chromeos::onc::test_utils::ReadTestData(filename); |
| 52 policy::PolicyMap policy; | 52 policy::PolicyMap policy; |
| 53 policy.Set(policy::key::kOpenNetworkConfiguration, | 53 policy.Set(policy::key::kOpenNetworkConfiguration, |
| 54 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, | 54 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, |
| 55 policy::POLICY_SOURCE_CLOUD, | 55 policy::POLICY_SOURCE_CLOUD, |
| 56 base::MakeUnique<base::StringValue>(user_policy_blob), nullptr); | 56 base::MakeUnique<base::Value>(user_policy_blob), nullptr); |
| 57 provider_.UpdateChromePolicy(policy); | 57 provider_.UpdateChromePolicy(policy); |
| 58 content::RunAllPendingInMessageLoop(); | 58 content::RunAllPendingInMessageLoop(); |
| 59 } | 59 } |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 void ClickElement(const std::string& selector) { | 62 void ClickElement(const std::string& selector) { |
| 63 EXPECT_TRUE(content::ExecuteScript( | 63 EXPECT_TRUE(content::ExecuteScript( |
| 64 GetSettingsFrame(), | 64 GetSettingsFrame(), |
| 65 "document.querySelector(\"" + selector + "\").click()")); | 65 "document.querySelector(\"" + selector + "\").click()")); |
| 66 } | 66 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 // managed setting indicator (only on Chrome OS). | 99 // managed setting indicator (only on Chrome OS). |
| 100 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, | 100 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, |
| 101 PolicyCertificateWithWebTrustHasIndicator) { | 101 PolicyCertificateWithWebTrustHasIndicator) { |
| 102 LoadONCPolicy("certificate-web-authority.onc"); | 102 LoadONCPolicy("certificate-web-authority.onc"); |
| 103 NavigateToSettings(); | 103 NavigateToSettings(); |
| 104 ClickElement("#certificatesManageButton"); | 104 ClickElement("#certificatesManageButton"); |
| 105 ClickElement("#ca-certs-nav-tab"); | 105 ClickElement("#ca-certs-nav-tab"); |
| 106 EXPECT_TRUE(HasElement(".cert-policy")); | 106 EXPECT_TRUE(HasElement(".cert-policy")); |
| 107 } | 107 } |
| 108 #endif | 108 #endif |
| OLD | NEW |