Cleanup the policy code after the recent moves into the component.

chrome/browser/net/proxy_policy_handler_unittest.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 <string>
 
-#include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/net/proxy_policy_handler.h"
 #include "chrome/browser/policy/configuration_policy_pref_store_test.h"
-#include "chrome/browser/policy/policy_transformations.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
 #include "components/policy/core/common/policy_service_impl.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 // Test cases for the proxy policy settings.
 class ProxyPolicyHandlerTest
     : public ConfigurationPolicyPrefStoreTest {
  public:
   virtual void SetUp() OVERRIDE {
     ConfigurationPolicyPrefStoreTest::SetUp();
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new ProxyPolicyHandler));
     // Reset the PolicyServiceImpl to one that has the policy fixup
     // preprocessor. The previous store must be nulled out first so that it
     // removes itself from the service's observer list.
     store_ = NULL;
-    policy_service_.reset(
-        new PolicyServiceImpl(providers_, base::Bind(&FixDeprecatedPolicies)));
+    policy_service_.reset(new PolicyServiceImpl(providers_));
     store_ = new ConfigurationPolicyPrefStore(
         policy_service_.get(), &handler_list_, POLICY_LEVEL_MANDATORY);
   }
 
  protected:
   // Verify that all the proxy prefs are set to the specified expected values.
   void VerifyProxyPrefs(
       const std::string& expected_proxy_server,
       const std::string& expected_proxy_pac_url,
       const std::string& expected_proxy_bypass_list,
@@ skipping 234 matching lines @@
   for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) {
     policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, base::Value::CreateIntegerValue(i), NULL);
     UpdateProviderPolicy(policy);
     const base::Value* value = NULL;
     EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value));
   }
 }
 
 }  // namespace policy