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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another test. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index e5a280543a0d81a9e7706cb24b359618d88ae3db..2302d820193b65741b4656f8d11d5affbe2fd4f0 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -1231,6 +1231,7 @@ void StartupBrowserCreatorFirstRunTest::SetUpInProcessBrowserTestFixture() {
policy_map_.Set(policy::key::kMetricsReportingEnabled,
policy::POLICY_LEVEL_MANDATORY,
policy::POLICY_SCOPE_USER,
+ policy::POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
provider_.UpdateChromePolicy(policy_map_);
@@ -1598,6 +1599,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
policy::key::kRestoreOnStartup,
policy::POLICY_LEVEL_MANDATORY,
policy::POLICY_SCOPE_USER,
+ policy::POLICY_SOURCE_CLOUD,
new base::FundamentalValue(SessionStartupPref::kPrefValueURLs),
NULL);
base::ListValue startup_urls;
@@ -1605,7 +1607,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
new base::StringValue(test_server()->GetURL("files/title1.html").spec()));
policy_map_.Set(policy::key::kRestoreOnStartupURLs,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
- startup_urls.DeepCopy(), NULL);
+ policy::POLICY_SOURCE_CLOUD, startup_urls.DeepCopy(),
+ nullptr);
provider_.UpdateChromePolicy(policy_map_);
base::RunLoop().RunUntilIdle();

Powered by Google App Engine
This is Rietveld 408576698