Retire the Enterprise Web Store policies.

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index a1c206aa7ecb1eae84c3bd532d3ca555095acdd9..767f33b37fb757dc07b9efbdbf27250575a4cb28 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -9,8 +9,6 @@
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_change_registrar.h"
-#include "base/prefs/pref_notifier.h"
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -20,7 +18,6 @@
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/id_util.h"
@@ -86,16 +83,7 @@ ComponentLoader::ComponentLoader(ExtensionServiceInterface* extension_service,
                                  PrefService* local_state)
     : profile_prefs_(profile_prefs),
       local_state_(local_state),
-      extension_service_(extension_service) {
-  pref_change_registrar_.Init(profile_prefs);
-
-  // This pref is set by policy. We have to watch it for change because on
-  // ChromeOS, policy isn't loaded until after the browser process is started.
-  pref_change_registrar_.Add(
-      prefs::kEnterpriseWebStoreURL,
-      base::Bind(&ComponentLoader::AddOrReloadEnterpriseWebStore,
-                 base::Unretained(this)));
-}
+      extension_service_(extension_service) {}
 
 ComponentLoader::~ComponentLoader() {
   ClearAllRegistered();
@@ -284,33 +272,6 @@ void ComponentLoader::AddImageLoaderExtension() {
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
 
-void ComponentLoader::AddOrReloadEnterpriseWebStore() {
-  base::FilePath path(FILE_PATH_LITERAL("enterprise_web_store"));
-
-  // Remove the extension if it was already loaded.
-  Remove(path);
-
-  std::string enterprise_webstore_url =
-      profile_prefs_->GetString(prefs::kEnterpriseWebStoreURL);
-
-  // Load the extension only if the URL preference is set.
-  if (!enterprise_webstore_url.empty()) {
-    std::string manifest_contents =
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_ENTERPRISE_WEBSTORE_MANIFEST).as_string();
-
-    // The manifest is missing some values that are provided by policy.
-    DictionaryValue* manifest = ParseManifest(manifest_contents);
-    if (manifest) {
-      std::string name =
-          profile_prefs_->GetString(prefs::kEnterpriseWebStoreName);
-      manifest->SetString("app.launch.web_url", enterprise_webstore_url);
-      manifest->SetString("name", name);
-      Add(manifest, path);
-    }
-  }
-}
-
 void ComponentLoader::AddChromeApp() {
 #if defined(ENABLE_APP_LIST)
   std::string manifest_contents =
@@ -377,13 +338,6 @@ void ComponentLoader::AddDefaultComponentExtensions(
 
   if (!skip_session_components) {
     Add(IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")));
-
-    // If a URL for the enterprise webstore has been specified, load the
-    // component extension. This extension might also be loaded later, because
-    // it is specified by policy, and on ChromeOS policies are loaded after
-    // the browser process has started.
-    AddOrReloadEnterpriseWebStore();
-
     AddChromeApp();
   }
 
@@ -485,17 +439,4 @@ void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   }
 }
 
-// static
-void ComponentLoader::RegisterUserPrefs(
-    user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterStringPref(
-      prefs::kEnterpriseWebStoreURL,

[Jeffrey Yasskin, 2013/05/16 16:59:36]

Now that we're not using these prefs anymore, could you add temporary code to
remove them from the users' prefs files? I'd kinda expect that to already exist
somewhere, but I don't know where it would be.

Or does the fact that the pref was added by policy mean that it'll automatically
get removed when enterprises stop adding it through policy?

[Mattias Nissler (ping if slow), 2013/05/17 09:38:17]

Good point actually. The rule we're generally following is this: Cleanup is
advised if Chrome could have dumped a value for the pref into the user's pref
file. If Chrome has never had code to write the pref, we deem cleanup
unnecessary.

In this case the pref has only ever been used as a vehicle to deliver the
policy, so we're good without cleanup code.

-      std::string() /* default_value */,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kEnterpriseWebStoreName,
-      std::string() /* default_value */,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-
 }  // namespace extensions