Remove retail mode.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

 // Copyright 2014 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/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #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"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 159 matching lines @@
           chromeos::CrosSettings::Get(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::IO),
           request_context));
   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_ =
       DeviceNetworkConfigurationUpdater::CreateForDevicePolicy(
           GetPolicyService(),
           chromeos::NetworkHandler::Get()
               ->managed_network_configuration_handler(),
           chromeos::NetworkHandler::Get()->network_device_handler(),
           chromeos::CrosSettings::Get());
 }
 
 void BrowserPolicyConnectorChromeOS::PreShutdown() {
   // Let the |device_cloud_policy_invalidator_| unregister itself as an
   // observer of per-Profile InvalidationServices and the device-global
   // invalidation::TiclInvalidationService it may have created as an observer of
   // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
   device_cloud_policy_invalidator_.reset();
 }
 
 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_)
     device_local_account_policy_service_->Shutdown();
 
   if (device_cloud_policy_initializer_)
     device_cloud_policy_initializer_->Shutdown();
 
   if (device_cloud_policy_manager_)
     device_cloud_policy_manager_->RemoveDeviceCloudPolicyManagerObserver(this);
@@ skipping 26 matching lines @@
   if (install_attributes_ &&
       (gaia::ExtractDomainName(gaia::CanonicalizeEmail(user_name)) ==
            install_attributes_->GetDomain() ||
        policy::IsDeviceLocalAccountUser(user_name, NULL))) {
     return USER_AFFILIATION_MANAGED;
   }
 
   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);
 }
 
 void BrowserPolicyConnectorChromeOS::SetConsumerManagementServiceForTesting(
     scoped_ptr<ConsumerManagementService> service) {
   consumer_management_service_ = service.Pass();
 }
 
@@ skipping 48 matching lines @@
   std::string timezone;
   if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
                                                &timezone) &&
       !timezone.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         base::UTF8ToUTF16(timezone));
   }
 }
 
 }  // namespace policy