Remove retail mode.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
index df82cdf870a22afbecf4526b69ab4547fcebe7c0..33c218acd1c471b3acc9ef5f1bffa1e3f03fc049 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
@@ -24,7 +24,7 @@ class URLRequestContextGetter;
 
 namespace policy {
 
-class AppPackUpdater;
+class ConsumerEnrollmentHandler;

[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.

 class ConsumerManagementService;
 class DeviceCloudPolicyInitializer;
 class DeviceCloudPolicyInvalidator;
@@ -73,8 +73,6 @@ class BrowserPolicyConnectorChromeOS
   // the installation attributes.
   UserAffiliation GetUserAffiliation(const std::string& user_name);
 
-  AppPackUpdater* GetAppPackUpdater();
-
   DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() {
     return device_cloud_policy_manager_;
   }
@@ -158,7 +156,6 @@ class BrowserPolicyConnectorChromeOS
   // pointer to get to the ProxyPolicyProvider at SetUserPolicyDelegate().
   ProxyPolicyProvider* global_user_cloud_policy_provider_;
 
-  scoped_ptr<AppPackUpdater> app_pack_updater_;
   scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
 
   base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;