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

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

Issue 2403053003: Remove unused email from install attributes and add support for AD. (Closed)
Patch Set: Address Maksim's comments. Created 4 years, 2 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 (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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 std::string(), false, false); 718 std::string(), false, false);
719 } 719 }
720 720
721 class ManagedPreferencesBrowserTest : public PreferencesBrowserTest { 721 class ManagedPreferencesBrowserTest : public PreferencesBrowserTest {
722 protected: 722 protected:
723 // PreferencesBrowserTest implementation: 723 // PreferencesBrowserTest implementation:
724 void SetUpInProcessBrowserTestFixture() override { 724 void SetUpInProcessBrowserTestFixture() override {
725 // Set up fake install attributes. 725 // Set up fake install attributes.
726 std::unique_ptr<chromeos::StubInstallAttributes> attributes = 726 std::unique_ptr<chromeos::StubInstallAttributes> attributes =
727 base::MakeUnique<chromeos::StubInstallAttributes>(); 727 base::MakeUnique<chromeos::StubInstallAttributes>();
728 attributes->SetDomain("example.com"); 728 attributes->SetEnterprise("example.com", "fake-id");
729 attributes->SetRegistrationUser("user@example.com");
730 policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting( 729 policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
731 attributes.release()); 730 attributes.release());
732 731
733 PreferencesBrowserTest::SetUpInProcessBrowserTestFixture(); 732 PreferencesBrowserTest::SetUpInProcessBrowserTestFixture();
734 } 733 }
735 }; 734 };
736 735
737 // Verifies that initializing the JavaScript Preferences class fires the correct 736 // Verifies that initializing the JavaScript Preferences class fires the correct
738 // notifications in JavaScript for pref values handled by the 737 // notifications in JavaScript for pref values handled by the
739 // CoreChromeOSOptionsHandler class for a managed device. 738 // CoreChromeOSOptionsHandler class for a managed device.
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); 1080 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2));
1082 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); 1081 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3));
1083 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); 1082 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4));
1084 1083
1085 VerifyCurrentProxyServer( 1084 VerifyCurrentProxyServer(
1086 "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",
1087 onc::ONC_SOURCE_NONE); 1086 onc::ONC_SOURCE_NONE);
1088 } 1087 }
1089 1088
1090 #endif 1089 #endif
OLDNEW
« no previous file with comments | « chrome/browser/net/errorpage_browsertest.cc ('k') | components/policy/core/common/cloud/cloud_policy_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698