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

Unified Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 2534983002: Re-enabled UserCloudPolicyManagerChromeOS unit tests (Closed)
Patch Set: Created 4 years, 1 month 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/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 2c0092a19bd37f10744db239ee2484b30f7c17c6..02dff8f7b184839a8d13d7029d3e8ca46fb51317 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/policy/cloud/cloud_policy_test_utils.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/policy/profile_policy_connector_factory.h"
#include "chrome/browser/policy/test/local_policy_test_server.h"
@@ -148,34 +149,6 @@ std::string GetTestPolicy(const char* homepage, int key_version) {
key_version);
}
-void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
- policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
-#if defined(OS_CHROMEOS)
- policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::StringValue>("primary-only"), nullptr);
- policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
- policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
- policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
- policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
- policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
-#endif
-}
-
void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
GetExpectedDefaultPolicy(expected);

Powered by Google App Engine
This is Rietveld 408576698