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

Unified Diff: components/policy/core/common/cloud/cloud_policy_manager_unittest.cc

Issue 1348903007: Revert of Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
index 24104031558152e78954dc977dbc5e1ba885c42c..076537f09fd420af243de4aad9f77ffd765c95a7 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
@@ -15,7 +15,6 @@
#include "components/policy/core/common/configuration_policy_provider_test.h"
#include "components/policy/core/common/external_data_fetcher.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
-#include "components/policy/core/common/policy_types.h"
#include "components/policy/core/common/schema_registry.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -63,8 +62,7 @@
};
TestHarness::TestHarness(PolicyLevel level)
- : PolicyProviderTestHarness(level, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD) {
-}
+ : PolicyProviderTestHarness(level, POLICY_SCOPE_USER) {}
TestHarness::~TestHarness() {}
@@ -89,7 +87,6 @@
store_.policy_map_.Set(policy_name,
policy_level(),
policy_scope(),
- POLICY_SOURCE_CLOUD,
new base::StringValue(policy_value),
nullptr);
}
@@ -99,9 +96,7 @@
store_.policy_map_.Set(policy_name,
policy_level(),
policy_scope(),
- POLICY_SOURCE_CLOUD,
- new base::
- FundamentalValue(policy_value),
+ new base::FundamentalValue(policy_value),
nullptr);
}
@@ -110,31 +105,21 @@
store_.policy_map_.Set(policy_name,
policy_level(),
policy_scope(),
- POLICY_SOURCE_CLOUD,
- new base::
- FundamentalValue(policy_value),
+ new base::FundamentalValue(policy_value),
nullptr);
}
void TestHarness::InstallStringListPolicy(const std::string& policy_name,
const base::ListValue* policy_value) {
- store_.policy_map_.Set(policy_name,
- policy_level(),
- policy_scope(),
- POLICY_SOURCE_CLOUD,
- policy_value->DeepCopy(),
- nullptr);
+ store_.policy_map_.Set(policy_name, policy_level(), policy_scope(),
+ policy_value->DeepCopy(), nullptr);
}
void TestHarness::InstallDictionaryPolicy(
const std::string& policy_name,
const base::DictionaryValue* policy_value) {
- store_.policy_map_.Set(policy_name,
- policy_level(),
- policy_scope(),
- POLICY_SOURCE_CLOUD,
- policy_value->DeepCopy(),
- nullptr);
+ store_.policy_map_.Set(policy_name, policy_level(), policy_scope(),
+ policy_value->DeepCopy(), nullptr);
}
// static
@@ -191,7 +176,6 @@
policy_map_.Set("key",
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
new base::StringValue("value"),
nullptr);
expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))

Powered by Google App Engine
This is Rietveld 408576698