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

components/policy/core/common/policy_service_impl_unittest.cc

 // Copyright (c) 2012 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/policy_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.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/mock_policy_service.h"
-#include "components/policy/core/common/policy_types.h"
 #include "policy/policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::_;
 
 namespace policy {
@@ skipping 19 matching lines @@
 // Helper that fills |bundle| with test policies.
 void AddTestPolicies(PolicyBundle* bundle,
                      const char* value,
                      PolicyLevel level,
                      PolicyScope scope) {
   PolicyMap* policy_map =
       &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
   policy_map->Set(kSameLevelPolicy,
                   POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_USER,
-                  POLICY_SOURCE_ENTERPRISE_DEFAULT,
                   new base::StringValue(value),
                   NULL);
   policy_map->Set(
-      kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
-      new base::StringValue(value), nullptr);
+      kDiffLevelPolicy, level, scope, new base::StringValue(value), NULL);
   policy_map =
       &bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension));
   policy_map->Set(kSameLevelPolicy,
                   POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_USER,
-                  POLICY_SOURCE_ENTERPRISE_DEFAULT,
                   new base::StringValue(value),
                   NULL);
   policy_map->Set(
-      kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
-      new base::StringValue(value), nullptr);
+      kDiffLevelPolicy, level, scope, new base::StringValue(value), NULL);
 }
 
 // Observer class that changes the policy in the passed provider when the
 // callback is invoked.
 class ChangePolicyObserver : public PolicyService::Observer {
  public:
   explicit ChangePolicyObserver(MockConfigurationPolicyProvider* provider)
       : provider_(provider),
         observer_invoked_(false) {}
 
   void OnPolicyUpdated(const PolicyNamespace&,
                        const PolicyMap& previous,
                        const PolicyMap& current) override {
     PolicyMap new_policy;
     new_policy.Set("foo",
                    POLICY_LEVEL_MANDATORY,
                    POLICY_SCOPE_USER,
-                   POLICY_SOURCE_CLOUD,
                    new base::FundamentalValue(14),
                    NULL);
     provider_->UpdateChromePolicy(new_policy);
     observer_invoked_ = true;
   }
 
   bool observer_invoked() const { return observer_invoked_; }
 
  private:
   MockConfigurationPolicyProvider* provider_;
@@ skipping 13 matching lines @@
     EXPECT_CALL(provider2_, IsInitializationComplete(_))
         .WillRepeatedly(Return(true));
 
     provider0_.Init();
     provider1_.Init();
     provider2_.Init();
 
     policy0_.Set("pre",
                  POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_ENTERPRISE_DEFAULT,
                  new base::FundamentalValue(13),
                  NULL);
     provider0_.UpdateChromePolicy(policy0_);
 
     PolicyServiceImpl::Providers providers;
     providers.push_back(&provider0_);
     providers.push_back(&provider1_);
     providers.push_back(&provider2_);
     policy_service_.reset(new PolicyServiceImpl(providers));
   }
@@ skipping 32 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PolicyServiceTest);
 };
 
 TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) {
   PolicyMap expected;
   expected.Set("pre",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_ENTERPRISE_DEFAULT,
                new base::FundamentalValue(13),
                NULL);
   EXPECT_TRUE(VerifyPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
 }
 
 TEST_F(PolicyServiceTest, NotifyObservers) {
   MockPolicyServiceObserver observer;
   policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer);
 
   PolicyMap expectedPrevious;
   expectedPrevious.Set("pre",
                        POLICY_LEVEL_MANDATORY,
                        POLICY_SCOPE_USER,
-                       POLICY_SOURCE_ENTERPRISE_DEFAULT,
                        new base::FundamentalValue(13),
                        NULL);
 
   PolicyMap expectedCurrent;
   expectedCurrent.CopyFrom(expectedPrevious);
   expectedCurrent.Set("aaa",
                       POLICY_LEVEL_MANDATORY,
                       POLICY_SCOPE_USER,
-                      POLICY_SOURCE_CLOUD,
                       new base::FundamentalValue(123),
                       NULL);
   policy0_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(123),
                NULL);
   EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
                                                         std::string()),
                                         PolicyEquals(&expectedPrevious),
                                         PolicyEquals(&expectedCurrent)));
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
 
   // No changes.
   EXPECT_CALL(observer, OnPolicyUpdated(_, _, _)).Times(0);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_TRUE(VerifyPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expectedCurrent));
 
   // New policy.
   expectedPrevious.CopyFrom(expectedCurrent);
   expectedCurrent.Set("bbb",
                       POLICY_LEVEL_MANDATORY,
                       POLICY_SCOPE_USER,
-                      POLICY_SOURCE_CLOUD,
                       new base::FundamentalValue(456),
                       NULL);
   policy0_.Set("bbb",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(456),
                NULL);
   EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
                                                         std::string()),
                                         PolicyEquals(&expectedPrevious),
                                         PolicyEquals(&expectedCurrent)));
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
 
   // Removed policy.
   expectedPrevious.CopyFrom(expectedCurrent);
   expectedCurrent.Erase("bbb");
   policy0_.Erase("bbb");
   EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
                                                         std::string()),
                                         PolicyEquals(&expectedPrevious),
                                         PolicyEquals(&expectedCurrent)));
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
 
   // Changed policy.
   expectedPrevious.CopyFrom(expectedCurrent);
   expectedCurrent.Set("aaa",
                       POLICY_LEVEL_MANDATORY,
                       POLICY_SCOPE_USER,
-                      POLICY_SOURCE_CLOUD,
                       new base::FundamentalValue(789),
                       NULL);
   policy0_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(789),
                NULL);
 
   EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
                                                         std::string()),
                                         PolicyEquals(&expectedPrevious),
                                         PolicyEquals(&expectedCurrent)));
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
 
@@ skipping 13 matching lines @@
   const std::string kExtension2("extension-2");
   MockPolicyServiceObserver chrome_observer;
   MockPolicyServiceObserver extension_observer;
   policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &chrome_observer);
   policy_service_->AddObserver(POLICY_DOMAIN_EXTENSIONS, &extension_observer);
 
   PolicyMap previous_policy_map;
   previous_policy_map.Set("pre",
                           POLICY_LEVEL_MANDATORY,
                           POLICY_SCOPE_USER,
-                          POLICY_SOURCE_ENTERPRISE_DEFAULT,
                           new base::FundamentalValue(13),
                           NULL);
   PolicyMap policy_map;
   policy_map.CopyFrom(previous_policy_map);
   policy_map.Set("policy",
                  POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
                  new base::StringValue("value"),
                  NULL);
 
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
   // The initial setup includes a policy for chrome that is now changing.
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .CopyFrom(policy_map);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension0))
       .CopyFrom(policy_map);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1))
@@ skipping 22 matching lines @@
 
   // Chrome policy stays the same, kExtension0 is gone, kExtension1 changes,
   // and kExtension2 is new.
   previous_policy_map.CopyFrom(policy_map);
   bundle.reset(new PolicyBundle());
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .CopyFrom(policy_map);
   policy_map.Set("policy",
                  POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
                  new base::StringValue("another value"),
                  NULL);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1))
       .CopyFrom(policy_map);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension2))
       .CopyFrom(policy_map);
 
   EXPECT_CALL(chrome_observer, OnPolicyUpdated(_, _, _)).Times(0);
   EXPECT_CALL(
       extension_observer,
@@ skipping 19 matching lines @@
   policy_service_->RemoveObserver(POLICY_DOMAIN_EXTENSIONS,
                                   &extension_observer);
 }
 
 TEST_F(PolicyServiceTest, ObserverChangesPolicy) {
   ChangePolicyObserver observer(&provider0_);
   policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer);
   policy0_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(123),
                NULL);
   policy0_.Set("bbb",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(1234),
                NULL);
   // Should not crash.
   provider0_.UpdateChromePolicy(policy0_);
   policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &observer);
   EXPECT_TRUE(observer.observer_invoked());
 }
 
 TEST_F(PolicyServiceTest, Priorities) {
   PolicyMap expected;
   expected.Set("pre",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_ENTERPRISE_DEFAULT,
                new base::FundamentalValue(13),
                NULL);
   expected.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(0),
                NULL);
   policy0_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(0),
                NULL);
   policy1_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(1),
                NULL);
   policy2_.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(2),
                NULL);
   provider0_.UpdateChromePolicy(policy0_);
   provider1_.UpdateChromePolicy(policy1_);
   provider2_.UpdateChromePolicy(policy2_);
   EXPECT_TRUE(VerifyPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
 
   expected.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(1),
                NULL);
   policy0_.Erase("aaa");
   provider0_.UpdateChromePolicy(policy0_);
   EXPECT_TRUE(VerifyPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
 
   expected.Set("aaa",
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(2),
                NULL);
   policy1_.Set("aaa",
                POLICY_LEVEL_RECOMMENDED,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(1),
                NULL);
   provider1_.UpdateChromePolicy(policy1_);
   EXPECT_TRUE(VerifyPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
 }
 
 TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
   scoped_ptr<PolicyChangeRegistrar> registrar(new PolicyChangeRegistrar(
       policy_service_.get(),
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())));
 
   // Starting to observe existing policies doesn't trigger a notification.
   EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
   registrar->Observe("pre", base::Bind(
       &PolicyServiceTest::OnPolicyValueUpdated,
       base::Unretained(this)));
   registrar->Observe("aaa", base::Bind(
       &PolicyServiceTest::OnPolicyValueUpdated,
       base::Unretained(this)));
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(this);
 
   // Changing it now triggers a notification.
   base::FundamentalValue kValue0(0);
   EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0)));
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr);
+               kValue0.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 
   // Changing other values doesn't trigger a notification.
   EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
   policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr);
+               kValue0.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 
   // Modifying the value triggers a notification.
   base::FundamentalValue kValue1(1);
   EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue0),
                                           ValueEquals(&kValue1)));
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr);
+               kValue1.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 
   // Removing the value triggers a notification.
   EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue1), NULL));
   policy0_.Erase("aaa");
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 
   // No more notifications after destroying the registrar.
   EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
   registrar.reset();
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr);
+               kValue1.DeepCopy(), NULL);
   policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_ENTERPRISE_DEFAULT, kValue1.DeepCopy(), nullptr);
+               kValue1.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 }
 
 TEST_F(PolicyServiceTest, RefreshPolicies) {
   EXPECT_CALL(provider0_, RefreshPolicies()).Times(AnyNumber());
   EXPECT_CALL(provider1_, RefreshPolicies()).Times(AnyNumber());
   EXPECT_CALL(provider2_, RefreshPolicies()).Times(AnyNumber());
 
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   policy_service_->RefreshPolicies(base::Bind(
       &PolicyServiceTest::OnPolicyRefresh,
       base::Unretained(this)));
   // Let any queued observer tasks run.
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   base::FundamentalValue kValue0(0);
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr);
+               kValue0.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   base::FundamentalValue kValue1(1);
   policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr);
+               kValue1.DeepCopy(), NULL);
   provider1_.UpdateChromePolicy(policy1_);
   Mock::VerifyAndClearExpectations(this);
 
   // A provider can refresh more than once after a RefreshPolicies call, but
   // OnPolicyRefresh should be triggered only after all providers are
   // refreshed.
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   policy1_.Set("bbb", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr);
+               kValue1.DeepCopy(), NULL);
   provider1_.UpdateChromePolicy(policy1_);
   Mock::VerifyAndClearExpectations(this);
 
   // If another RefreshPolicies() call happens while waiting for a previous
   // one to complete, then all providers must refresh again.
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   policy_service_->RefreshPolicies(base::Bind(
       &PolicyServiceTest::OnPolicyRefresh,
       base::Unretained(this)));
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
   policy2_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr);
+               kValue0.DeepCopy(), NULL);
   provider2_.UpdateChromePolicy(policy2_);
   Mock::VerifyAndClearExpectations(this);
 
   // Providers 0 and 1 must reload again.
   EXPECT_CALL(*this, OnPolicyRefresh()).Times(2);
   base::FundamentalValue kValue2(2);
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, kValue2.DeepCopy(), nullptr);
+               kValue2.DeepCopy(), NULL);
   provider0_.UpdateChromePolicy(policy0_);
   provider1_.UpdateChromePolicy(policy1_);
   Mock::VerifyAndClearExpectations(this);
 
   const PolicyMap& policies = policy_service_->GetPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
   EXPECT_TRUE(base::Value::Equals(&kValue2, policies.GetValue("aaa")));
   EXPECT_TRUE(base::Value::Equals(&kValue0, policies.GetValue("bbb")));
 }
 
@@ skipping 13 matching lines @@
   provider1_.UpdatePolicy(bundle1.Pass());
   provider2_.UpdatePolicy(bundle2.Pass());
   RunUntilIdle();
 
   PolicyMap expected;
   // For policies of the same level and scope, the first provider takes
   // precedence, on every namespace.
   expected.Set(kSameLevelPolicy,
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
-               POLICY_SOURCE_ENTERPRISE_DEFAULT,
                new base::StringValue("bundle0"),
                NULL);
   // For policies with different levels and scopes, the highest priority
   // level/scope combination takes precedence, on every namespace.
   expected.Set(kDiffLevelPolicy,
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_MACHINE,
-               POLICY_SOURCE_PLATFORM,
                new base::StringValue("bundle2"),
                NULL);
   EXPECT_TRUE(policy_service_->GetPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())).Equals(expected));
   EXPECT_TRUE(policy_service_->GetPolicies(
       PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension)).Equals(expected));
 }
 
 TEST_F(PolicyServiceTest, IsInitializationComplete) {
   // |provider0| has all domains initialized.
@@ skipping 79 matching lines @@
   const PolicyNamespace chrome_namespace(POLICY_DOMAIN_CHROME, std::string());
   const PolicyNamespace extension_namespace(POLICY_DOMAIN_EXTENSIONS, "xyz");
 
   scoped_ptr<PolicyBundle> policy_bundle(new PolicyBundle());
   PolicyMap& policy_map = policy_bundle->Get(chrome_namespace);
   // Individual proxy policy values in the Chrome namespace should be collected
   // into a dictionary.
   policy_map.Set(key::kProxyServerMode,
                  POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
                  new base::FundamentalValue(3),
                  NULL);
 
   // Both these policies should be ignored, since there's a higher priority
   // policy available.
   policy_map.Set(key::kProxyMode,
                  POLICY_LEVEL_RECOMMENDED,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
                  new base::StringValue("pac_script"),
                  NULL);
   policy_map.Set(key::kProxyPacUrl,
                  POLICY_LEVEL_RECOMMENDED,
                  POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
                  new base::StringValue("http://example.com/wpad.dat"),
                  NULL);
 
   // Add a value to a non-Chrome namespace.
   policy_bundle->Get(extension_namespace).Set(key::kProxyServerMode,
                                               POLICY_LEVEL_MANDATORY,
                                               POLICY_SCOPE_USER,
-                                              POLICY_SOURCE_CLOUD,
                                               new base::FundamentalValue(3),
                                               NULL);
 
   // The resulting Chrome namespace map should have the collected policy.
   PolicyMap expected_chrome;
   scoped_ptr<base::DictionaryValue> expected_value(new base::DictionaryValue);
   expected_value->SetInteger(key::kProxyServerMode, 3);
   expected_chrome.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY,
-                      POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                      expected_value.release(), nullptr);
+                      POLICY_SCOPE_USER, expected_value.release(), NULL);
 
   // The resulting Extensions namespace map shouldn't have been modified.
   PolicyMap expected_extension;
   expected_extension.Set(key::kProxyServerMode,
                          POLICY_LEVEL_MANDATORY,
                          POLICY_SCOPE_USER,
-                         POLICY_SOURCE_CLOUD,
                          new base::FundamentalValue(3),
                          NULL);
 
   provider0_.UpdatePolicy(policy_bundle.Pass());
   RunUntilIdle();
 
   EXPECT_TRUE(VerifyPolicies(chrome_namespace, expected_chrome));
   EXPECT_TRUE(VerifyPolicies(extension_namespace, expected_extension));
 }
 
 }  // namespace policy