Revert 229896 "Cache force-installed apps/extensions in device-l..."

trunk/src/chrome/browser/extensions/external_provider_impl.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/extensions/external_provider_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/manifest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h"
 #include "chrome/browser/chromeos/extensions/external_pref_cache_loader.h"
-#include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
-#include "chrome/browser/chromeos/policy/device_local_account.h"
-#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/external_registry_loader_win.h"
 #endif
 
 using content::BrowserThread;
 
 namespace extensions {
 
 // Constants for keeping track of extension preferences in a dictionary.
 const char ExternalProviderImpl::kExternalCrx[] = "external_crx";
 const char ExternalProviderImpl::kExternalVersion[] = "external_version";
 const char ExternalProviderImpl::kExternalUpdateUrl[] = "external_update_url";
 const char ExternalProviderImpl::kSupportedLocales[] = "supported_locales";
 const char ExternalProviderImpl::kIsBookmarkApp[] = "is_bookmark_app";
 const char ExternalProviderImpl::kIsFromWebstore[] = "is_from_webstore";
 const char ExternalProviderImpl::kKeepIfPresent[] = "keep_if_present";
 const char ExternalProviderImpl::kRequirePermissionsConsent[] =
     "require_permissions_consent";
 
-ExternalProviderImpl::ExternalProviderImpl(
-    VisitorInterface* service,
-    const scoped_refptr<ExternalLoader>& loader,
-    Profile* profile,
-    Manifest::Location crx_location,
-    Manifest::Location download_location,
-    int creation_flags)
+ExternalProviderImpl::ExternalProviderImpl(VisitorInterface* service,
+                                           ExternalLoader* loader,
+                                           Profile* profile,
+                                           Manifest::Location crx_location,
+                                           Manifest::Location download_location,
+                                           int creation_flags)
     : crx_location_(crx_location),
       download_location_(download_location),
       service_(service),
       ready_(false),
       loader_(loader),
       profile_(profile),
       creation_flags_(creation_flags),
       auto_acknowledge_(false) {
   loader_->Init(this);
 }
@@ skipping 259 matching lines @@
     *location = loc;
 
   return true;
 }
 
 // static
 void ExternalProviderImpl::CreateExternalProviders(
     VisitorInterface* service,
     Profile* profile,
     ProviderCollection* provider_list) {
-  scoped_refptr<ExternalLoader> external_loader;
-  extensions::Manifest::Location crx_location = Manifest::INVALID_LOCATION;
-#if defined(OS_CHROMEOS)
-  const chromeos::User* user =
-      chromeos::UserManager::Get()->GetUserByProfile(profile);
-  if (user && policy::IsDeviceLocalAccountUser(user->email(), NULL)) {
-    policy::DeviceLocalAccountPolicyBroker* broker =
-        g_browser_process->browser_policy_connector()->
-            GetDeviceLocalAccountPolicyService()->
-                GetBrokerForUser(user->email());
-    if (broker) {
-      external_loader = broker->extension_loader();
-      crx_location = Manifest::EXTERNAL_POLICY;
-    } else {
-      NOTREACHED();
-    }
-  } else {
-    external_loader = new ExternalPolicyLoader(profile);
-  }
-#else
-  external_loader = new ExternalPolicyLoader(profile);
-#endif
-
   // Policies are mandatory so they can't be skipped with command line flag.
-  if (external_loader) {
-    provider_list->push_back(
-        linked_ptr<ExternalProviderInterface>(
-            new ExternalProviderImpl(
-                service,
-                external_loader,
-                profile,
-                crx_location,
-                Manifest::EXTERNAL_POLICY_DOWNLOAD,
-                Extension::NO_FLAGS)));
-  }
+  provider_list->push_back(
+      linked_ptr<ExternalProviderInterface>(
+          new ExternalProviderImpl(
+              service,
+              new ExternalPolicyLoader(profile),
+              profile,
+              Manifest::INVALID_LOCATION,
+              Manifest::EXTERNAL_POLICY_DOWNLOAD,
+              Extension::NO_FLAGS)));
 
   // In tests don't install extensions from default external sources.
   // It would only slowdown tests and make them flaky.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableDefaultApps))
     return;
 
   // No external app install in app mode.
   if (chrome::IsRunningInForcedAppMode())
     return;
@@ skipping 129 matching lines @@
             service,
             new ExternalComponentLoader(),
             profile,
             Manifest::INVALID_LOCATION,
             Manifest::EXTERNAL_COMPONENT,
             Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
   }
 }
 
 }  // namespace extensions