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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_browsertest.cc

Issue 2703283002: Revert of MD Settings: enable by default in client (Closed)
Patch Set: Created 3 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
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/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 17 matching lines...) Expand all
28 using testing::Return; 28 using testing::Return;
29 using testing::_; 29 using testing::_;
30 30
31 class CertificateManagerBrowserTest : public options::OptionsUIBrowserTest { 31 class CertificateManagerBrowserTest : public options::OptionsUIBrowserTest {
32 public: 32 public:
33 CertificateManagerBrowserTest() {} 33 CertificateManagerBrowserTest() {}
34 ~CertificateManagerBrowserTest() override {} 34 ~CertificateManagerBrowserTest() override {}
35 35
36 protected: 36 protected:
37 void SetUpInProcessBrowserTestFixture() override { 37 void SetUpInProcessBrowserTestFixture() override {
38 options::OptionsUIBrowserTest::SetUpInProcessBrowserTestFixture();
39 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
40 device_policy_test_helper_.MarkAsEnterpriseOwned(); 39 device_policy_test_helper_.MarkAsEnterpriseOwned();
41 #endif 40 #endif
42 // Setup the policy provider for injecting certs through ONC policy. 41 // Setup the policy provider for injecting certs through ONC policy.
43 EXPECT_CALL(provider_, IsInitializationComplete(_)) 42 EXPECT_CALL(provider_, IsInitializationComplete(_))
44 .WillRepeatedly(Return(true)); 43 .WillRepeatedly(Return(true));
45 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); 44 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
46 } 45 }
47 46
48 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // managed setting indicator (only on Chrome OS). 98 // managed setting indicator (only on Chrome OS).
100 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, 99 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest,
101 PolicyCertificateWithWebTrustHasIndicator) { 100 PolicyCertificateWithWebTrustHasIndicator) {
102 LoadONCPolicy("certificate-web-authority.onc"); 101 LoadONCPolicy("certificate-web-authority.onc");
103 NavigateToSettings(); 102 NavigateToSettings();
104 ClickElement("#certificatesManageButton"); 103 ClickElement("#certificatesManageButton");
105 ClickElement("#ca-certs-nav-tab"); 104 ClickElement("#ca-certs-nav-tab");
106 EXPECT_TRUE(HasElement(".cert-policy")); 105 EXPECT_TRUE(HasElement(".cert-policy"));
107 } 106 }
108 #endif 107 #endif
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698