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

chrome/browser/chromeos/policy/cloud_external_data_policy_observer_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 "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 305 matching lines @@
 void CloudExternalDataPolicyObserverTest::LogInAsDeviceLocalAccount(
     const std::string& user_id) {
   device_local_account_policy_provider_.reset(
       new DeviceLocalAccountPolicyProvider(
           user_id,
           device_local_account_policy_service_.get()));
 
   PolicyServiceImpl::Providers providers;
   providers.push_back(device_local_account_policy_provider_.get());
   TestingProfile::Builder builder;
-  builder.SetPolicyService(scoped_ptr<PolicyService>(new PolicyServiceImpl(
-      providers,
-      PolicyServiceImpl::PreprocessCallback())));
+  builder.SetPolicyService(
+      scoped_ptr<PolicyService>(new PolicyServiceImpl(providers)));
 
   profile_ = builder.Build();
   profile_->set_profile_name(user_id);
 
   user_manager_.AddUser(user_id);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources(),
       content::Details<Profile>(profile_.get()));
 }
@@ skipping 10 matching lines @@
         external_data_manager_.CreateExternalDataFetcher(
             key::kUserAvatarImage).release());
   }
   user_policy_provider_.UpdateChromePolicy(policy_map);
 }
 
 void CloudExternalDataPolicyObserverTest::LogInAsRegularUser() {
   PolicyServiceImpl::Providers providers;
   providers.push_back(&user_policy_provider_);
   TestingProfile::Builder builder;
-  builder.SetPolicyService(scoped_ptr<PolicyService>(new PolicyServiceImpl(
-      providers,
-      PolicyServiceImpl::PreprocessCallback())));
+  builder.SetPolicyService(
+      scoped_ptr<PolicyService>(new PolicyServiceImpl(providers)));
 
   profile_ = builder.Build();
   profile_->set_profile_name(kRegularUserID);
 
   user_manager_.AddUser(kRegularUserID);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources(),
       content::Details<Profile>(profile_.get()));
 }
@@ skipping 565 matching lines @@
 
   EXPECT_TRUE(set_calls_.empty());
   EXPECT_TRUE(cleared_calls_.empty());
   ASSERT_EQ(1u, fetched_calls_.size());
   EXPECT_EQ(kRegularUserID, fetched_calls_.front().first);
   EXPECT_EQ(avatar_policy_2_data_, fetched_calls_.front().second);
   ClearObservations();
 }
 
 }  // namespace policy