Revert of Add source column to chrome://policy showing the origins of policies.

components/policy/core/common/configuration_policy_provider_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/policy/core/common/configuration_policy_provider_test.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "components/policy/core/common/configuration_policy_provider.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_bundle.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
-#include "components/policy/core/common/policy_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::Mock;
 using ::testing::_;
 
 namespace policy {
 
 const char kTestChromeSchema[] =
     "{"
     "  \"type\": \"object\","
@@ skipping 113 matching lines @@
   Schema schema = Schema::Parse(schema_string, &error);
   if (schema.valid()) {
     schema_registry_.RegisterComponent(ns, schema);
     return true;
   }
   ADD_FAILURE() << error;
   return false;
 }
 
 PolicyProviderTestHarness::PolicyProviderTestHarness(PolicyLevel level,
-                                                     PolicyScope scope,
-                                                     PolicySource source)
-    : level_(level), scope_(scope), source_(source) {}
+                                                     PolicyScope scope)
+    : level_(level), scope_(scope) {}
 
 PolicyProviderTestHarness::~PolicyProviderTestHarness() {}
 
 PolicyLevel PolicyProviderTestHarness::policy_level() const {
   return level_;
 }
 
 PolicyScope PolicyProviderTestHarness::policy_scope() const {
   return scope_;
 }
 
-PolicySource PolicyProviderTestHarness::policy_source() const {
-  return source_;
-}
-
 void PolicyProviderTestHarness::Install3rdPartyPolicy(
     const base::DictionaryValue* policies) {
   FAIL();
 }
 
 ConfigurationPolicyProviderTest::ConfigurationPolicyProviderTest() {}
 
 ConfigurationPolicyProviderTest::~ConfigurationPolicyProviderTest() {}
 
 void ConfigurationPolicyProviderTest::SetUp() {
@@ skipping 45 matching lines @@
     base::Closure install_value) {
   // Install the value, reload policy and check the provider for the value.
   install_value.Run();
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
   PolicyBundle expected_bundle;
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(policy_name,
            test_harness_->policy_level(),
            test_harness_->policy_scope(),
-           test_harness_->policy_source(),
            expected_value.DeepCopy(),
            NULL);
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
   // TODO(joaodasilva): set the policy in the POLICY_DOMAIN_EXTENSIONS too,
   // and extend the |expected_bundle|, once all providers are ready.
 }
 
 TEST_P(ConfigurationPolicyProviderTest, Empty) {
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
@@ skipping 96 matching lines @@
   test_harness_->InstallStringPolicy(test_keys::kKeyString, "value");
   EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(1);
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(test_keys::kKeyString,
            test_harness_->policy_level(),
            test_harness_->policy_scope(),
-           test_harness_->policy_source(),
            new base::StringValue("value"),
            NULL);
   EXPECT_TRUE(provider_->policies().Equals(bundle));
   provider_->RemoveObserver(&observer);
 }
 
 Configuration3rdPartyPolicyProviderTest::
     Configuration3rdPartyPolicyProviderTest() {}
 
 Configuration3rdPartyPolicyProviderTest::
@@ skipping 32 matching lines @@
                       new base::StringValue("invalid-value"));
   test_harness_->Install3rdPartyPolicy(&policy_3rdparty);
 
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
 
   PolicyMap expected_policy;
   expected_policy.Set(test_keys::kKeyDictionary,
                       test_harness_->policy_level(),
                       test_harness_->policy_scope(),
-                      test_harness_->policy_source(),
                       policy_dict.DeepCopy(),
                       NULL);
   PolicyBundle expected_bundle;
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .CopyFrom(expected_policy);
   expected_policy.Clear();
   expected_policy.LoadFrom(&policy_dict,
                            test_harness_->policy_level(),
-                           test_harness_->policy_scope(),
-                           test_harness_->policy_source());
+                           test_harness_->policy_scope());
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
                                       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))
       .CopyFrom(expected_policy);
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
                                       "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"))
       .CopyFrom(expected_policy);
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
 }
 
 }  // namespace policy