Revert 233048 "Support policies referencing external data for de..."

trunk/src/chrome/browser/policy/browser_policy_connector.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 "chrome/browser/policy/browser_policy_connector.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 289 matching lines @@
   }
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) {
     device_local_account_policy_service_.reset(
         new DeviceLocalAccountPolicyService(
             chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
             chromeos::DeviceSettingsService::Get(),
             chromeos::CrosSettings::Get(),
             GetBackgroundTaskRunner(),
-            GetBackgroundTaskRunner(),
-            GetBackgroundTaskRunner(),
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::IO),
-            request_context));
+            GetBackgroundTaskRunner()));
     device_local_account_policy_service_->Connect(
         device_management_service_.get());
   }
 
   GetAppPackUpdater();
 
   SetTimezoneIfPolicyAvailable();
 #endif
 
   policy_statistics_collector_.reset(
@@ skipping 30 matching lines @@
 #if defined(OS_CHROMEOS)
   // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|.
   // Delete it first.
   app_pack_updater_.reset();
 
   network_configuration_updater_.reset();
 
   if (device_cloud_policy_manager_)
     device_cloud_policy_manager_->Shutdown();
   if (device_local_account_policy_service_)
-    device_local_account_policy_service_->Shutdown();
+    device_local_account_policy_service_->Disconnect();
   global_user_cloud_policy_provider_.Shutdown();
 #endif
 
   device_management_service_.reset();
 
   request_context_ = NULL;
 }
 
 PolicyService* BrowserPolicyConnector::GetPolicyService() {
   if (!policy_service_) {
@@ skipping 218 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy