Remove retail mode.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index a188a65f20128fe00fe9a6c76a9ce0d011eeb728..12b765008c2592f0d365c152a87c1e105b6a97d3 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -17,7 +17,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/policy/app_pack_updater.h"
+#include "chrome/browser/chromeos/policy/consumer_enrollment_handler.h"

[bartfab (slow), 2014/12/15 16:08:40]

Nit: Why are you adding this?

[rkc, 2014/12/15 20:45:58]

Merge screwup. Fixed.
Done.

 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
@@ -197,12 +197,6 @@ void BrowserPolicyConnectorChromeOS::Init(
   device_local_account_policy_service_->Connect(device_management_service());
   device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator);
 
-  // request_context is NULL in unit tests.
-  if (request_context.get() && install_attributes_) {
-    app_pack_updater_.reset(
-        new AppPackUpdater(request_context.get(), install_attributes_.get()));
-  }
-
   SetTimezoneIfPolicyAvailable();
 
   network_configuration_updater_ =
@@ -226,10 +220,6 @@ void BrowserPolicyConnectorChromeOS::Shutdown() {
   // Verify that PreShutdown() has been called first.
   DCHECK(!device_cloud_policy_invalidator_);
 
-  // The AppPackUpdater may be observing the |device_cloud_policy_manager_|.
-  // Delete it first.
-  app_pack_updater_.reset();
-
   network_configuration_updater_.reset();
 
   if (device_local_account_policy_service_)
@@ -276,10 +266,6 @@ UserAffiliation BrowserPolicyConnectorChromeOS::GetUserAffiliation(
   return USER_AFFILIATION_NONE;
 }
 
-AppPackUpdater* BrowserPolicyConnectorChromeOS::GetAppPackUpdater() {
-  return app_pack_updater_.get();
-}
-
 void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
     ConfigurationPolicyProvider* user_policy_provider) {
   global_user_cloud_policy_provider_->SetDelegate(user_policy_provider);