Revert 57460 - Add hidden component app for web store.

This patch adds a component which does not appear on the NTP, but does enforce that gallery urls are isolated in their own process. This is in anticipation of exposing extension api bindings to the gallery so it can install/detect/uninstall extensions & apps.

Note that this patch works correctly with the --apps-gallery-url. If specified, the replacement url will be inserted into the component app's extent

BUG=27431

Review URL: http://codereview.chromium.org/3116040

TBR=rafaelw@chromium.org
Review URL: http://codereview.chromium.org/3180027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57468 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 5 insertions, 48 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 648ba2b..24b9baf 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -62,7 +62,6 @@ without changes to the corresponding grd file. eadeae-->
       <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
       <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_invalid.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index d05ebf7..825be90 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
@@ -110,13 +109,11 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) {
   const ExtensionList* extensions = extensions_service_->extensions();
   for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
-    // Don't include the WebStore component app. The WebStore launcher
-    // gets special treatment in ntp/apps.js.
-    if ((*it)->is_app() && (*it)->id() != extension_misc::kWebStoreAppId) {
-      DictionaryValue* app_info = new DictionaryValue();
-      CreateAppInfo(*it, app_info);
-      list->Append(app_info);
-    }
+     if ((*it)->is_app()) {
+       DictionaryValue* app_info = new DictionaryValue();
+       CreateAppInfo(*it, app_info);
+       list->Append(app_info);
+     }
   }
 
   dictionary.Set("apps", list);
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 3fb4a91..169f15f 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -530,21 +530,6 @@ void ExtensionsService::LoadComponentExtensions() {
       return;
     }
 
-    // In order for the --apps-gallery-url switch to work with the gallery
-    // process isolation, we must insert any provided value into the component
-    // app's launch url and web extent.
-    if (extension->id() == extension_misc::kWebStoreAppId ) {
-      GURL gallery_url(CommandLine::ForCurrentProcess()
-          ->GetSwitchValueASCII(switches::kAppsGalleryURL));
-      if (gallery_url.is_valid()) {
-        extension->set_launch_web_url(gallery_url.spec());
-        URLPattern pattern(URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS);
-        pattern.Parse(gallery_url.spec());
-        pattern.set_path(pattern.path() + '*');
-        extension->web_extent().AddPattern(pattern);
-      }
-    }
-
     OnExtensionLoaded(extension.release(), false);  // Don't allow privilege
                                                     // increase.
   }
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index 677cf69..64027a1 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -391,10 +391,6 @@ void ProfileImpl::InitExtensions() {
   component_extensions.push_back(
       std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
 
-  // Web Store.
-  component_extensions.push_back(
-      std::make_pair("web_store", IDR_WEBSTORE_MANIFEST));
-
   // Some sample apps to make our lives easier while we are developing extension
   // apps. This way we don't have to constantly install these over and over.
   if (Extension::AppsAreEnabled() && IncludeDefaultApps()) {
diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browser/resources/webstore_app/manifest.json
deleted file mode 100644
index 0b94ace..0000000
--- a/chrome/browser/resources/webstore_app/manifest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtl3tO0osjuzRsf6xtD2SKxPlTfuoy7AWoObysitBPvH5fE1NaAA1/2JkPWkVDhdLBWLaIBPYeXbzlHp3y4Vv/4XG+aN5qFE3z+1RU/NqkzVYHtIpVScf3DjTYtKVL66mzVGijSoAIwbFCC3LpGdaoe6Q1rSRDp76wR6jjFzsYwQIDAQAB",
-  "name": "Chrome Web Store",
-  "version": "0.1",
-  "description": "Web Store",
-  "icons": {
-  },
-  "app": {
-    "launch": {
-      "web_url": "https://chrome.google.com/extensions"
-    },
-    "urls": [
-      "https://chrome.google.com/extensions",
-      "https://clients2.google.com/service/update2",
-      "https://clients2.googleusercontent.com/crx"
-    ]
-  },
-  "permissions": [
-  ]
-}