Revert "Allow silent extension installations from the extensions gallery - Part 1."

Original CL: http://codereview.chromium.org/400018/show

Looks like we're no longer hoping to get this approach into mstone4 release, so I'm unwinding this.

BUG=27431
TBR=aa

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

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

19 files changed, 61 insertions, 254 deletions

diff --git a/chrome/browser/browsing_instance.cc b/chrome/browser/browsing_instance.cc
index 8aeb69c..ff3346a 100644
--- a/chrome/browser/browsing_instance.cc
+++ b/chrome/browser/browsing_instance.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 
 /*static*/
@@ -32,11 +31,9 @@ bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) {
     // process creation logic in RenderProcessHost, so we do not need to worry
     // about it here.
     if (url.SchemeIs(chrome::kChromeUIScheme) ||
-        url.SchemeIs(chrome::kExtensionScheme) ||
-        Extension::IsGalleryURL(url))
+        url.SchemeIs(chrome::kExtensionScheme))
       // Always consolidate instances of the new tab page (and instances of any
-      // other internal resource urls), as well as extensions and extension
-      // gallery pages, which have special install privileges.
+      // other internal resource urls), as well as extensions.
       return true;
 
     // TODO(creis): List any other special cases that we want to limit to a
diff --git a/chrome/browser/child_process_security_policy.cc b/chrome/browser/child_process_security_policy.cc
index 6d5482b..635e0cf 100644
--- a/chrome/browser/child_process_security_policy.cc
+++ b/chrome/browser/child_process_security_policy.cc
@@ -19,8 +19,7 @@ class ChildProcessSecurityPolicy::SecurityState {
  public:
   SecurityState()
     : enabled_bindings_(0),
-      can_read_raw_cookies_(false),
-      can_install_extensions_silently_(false) { }
+      can_read_raw_cookies_(false) { }
   ~SecurityState() {
     scheme_policy_.clear();
   }
@@ -48,10 +47,6 @@ class ChildProcessSecurityPolicy::SecurityState {
     can_read_raw_cookies_ = true;
   }
 
-  void GrantInstallExtensionsSilently() {
-    can_install_extensions_silently_ = true;
-  }
-
   void RevokeReadRawCookies() {
     can_read_raw_cookies_ = false;
   }
@@ -81,10 +76,6 @@ class ChildProcessSecurityPolicy::SecurityState {
     return BindingsPolicy::is_extension_enabled(enabled_bindings_);
   }
 
-  bool can_install_extensions_silently() const {
-    return can_install_extensions_silently_;
-  }
-
   bool can_read_raw_cookies() const {
     return can_read_raw_cookies_;
   }
@@ -107,8 +98,6 @@ class ChildProcessSecurityPolicy::SecurityState {
 
   bool can_read_raw_cookies_;
 
-  bool can_install_extensions_silently_;
-
   DISALLOW_COPY_AND_ASSIGN(SecurityState);
 };
 
@@ -279,17 +268,6 @@ void ChildProcessSecurityPolicy::GrantExtensionBindings(int renderer_id) {
   state->second->GrantBindings(BindingsPolicy::EXTENSION);
 }
 
-void ChildProcessSecurityPolicy::GrantInstallExtensionsSilently(
-    int renderer_id) {
-  AutoLock lock(lock_);
-
-  SecurityStateMap::iterator state = security_state_.find(renderer_id);
-  if (state == security_state_.end())
-    return;
-
-  state->second->GrantInstallExtensionsSilently();
-}
-
 void ChildProcessSecurityPolicy::GrantReadRawCookies(int renderer_id) {
   AutoLock lock(lock_);
 
@@ -384,16 +362,6 @@ bool ChildProcessSecurityPolicy::HasExtensionBindings(int renderer_id) {
   return state->second->has_extension_bindings();
 }
 
-bool ChildProcessSecurityPolicy::CanInstallExtensionsSilently(int renderer_id) {
-  AutoLock lock(lock_);
-
-  SecurityStateMap::iterator state = security_state_.find(renderer_id);
-  if (state == security_state_.end())
-    return false;
-
-  return state->second->can_install_extensions_silently();
-}
-
 bool ChildProcessSecurityPolicy::CanReadRawCookies(int renderer_id) {
   AutoLock lock(lock_);
 
diff --git a/chrome/browser/child_process_security_policy.h b/chrome/browser/child_process_security_policy.h
index 20ff53b..9cde10a 100644
--- a/chrome/browser/child_process_security_policy.h
+++ b/chrome/browser/child_process_security_policy.h
@@ -80,11 +80,6 @@ class ChildProcessSecurityPolicy {
   // Grant this renderer the ability to use extension Bindings.
   void GrantExtensionBindings(int renderer_id);
 
-  // Grant bindings to this renderer for the ability to silently install
-  // extensions. Granting this permission to a renderer requires that the
-  // renderer ONLY be used for gallery URLS.
-  void GrantInstallExtensionsSilently(int renderer_id);
-
   // Grant this renderer the ability to read raw cookies.
   void GrantReadRawCookies(int renderer_id);
 
@@ -106,17 +101,11 @@ class ChildProcessSecurityPolicy {
   // allowed to use DOMUIBindings.
   bool HasDOMUIBindings(int renderer_id);
 
-  // Returns true if the specified renderer_id has been granted extension
-  // bindings. The browser should check this property before assuming the
-  // renderer is allowed to use extension bindings.
+  // Returns true if the specified renderer_id has been granted DOMUIBindings.
+  // The browser should check this property before assuming the renderer is
+  // allowed to use extension bindings.
   bool HasExtensionBindings(int renderer_id);
 
-  // Returns true if the specified renderer_id has been granted
-  // InstallExtensionsSilently. The browser should check this property before
-  // allowing an extension to be installed without prompting the user
-  // for confirmation.
-  bool CanInstallExtensionsSilently(int renderer_id);
-
   // Returns true if the specified renderer_id has been granted ReadRawCookies.
   bool CanReadRawCookies(int renderer_id);
 
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 28de0fe..af7c9d5 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -576,8 +576,8 @@ void DownloadManager::StartDownload(DownloadCreateInfo* info) {
     if (IsDangerous(info->suggested_path.BaseName()))
       info->is_dangerous = true;
     else if (IsExtensionInstall(info) &&
-             !Extension::IsDownloadFromGallery(info->url,
-                                               info->referrer_url)) {
+             !ExtensionsService::IsDownloadFromGallery(info->url,
+                                                       info->referrer_url)) {
       info->is_dangerous = true;
     }
   }
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 2ae7f5e..058907e 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -81,6 +81,26 @@ class InstalledExtensionSet {
 const char* ExtensionsService::kInstallDirectoryName = "Extensions";
 const char* ExtensionsService::kCurrentVersionFileName = "Current Version";
 
+// static
+bool ExtensionsService::IsDownloadFromGallery(const GURL& download_url,
+                                              const GURL& referrer_url) {
+  if (StartsWithASCII(download_url.spec(),
+                      extension_urls::kMiniGalleryDownloadPrefix, false) &&
+      StartsWithASCII(referrer_url.spec(),
+                      extension_urls::kMiniGalleryBrowsePrefix, false)) {
+    return true;
+  }
+
+  if (StartsWithASCII(download_url.spec(),
+                      extension_urls::kGalleryDownloadPrefix, false) &&
+      StartsWithASCII(referrer_url.spec(),
+                      extension_urls::kGalleryBrowsePrefix, false)) {
+    return true;
+  }
+
+  return false;
+}
+
 ExtensionsService::ExtensionsService(Profile* profile,
                                      const CommandLine* command_line,
                                      PrefService* prefs,
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index 0492538..30751f6 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -73,6 +73,11 @@ class ExtensionsService
   // The name of the file that the current active version number is stored in.
   static const char* kCurrentVersionFileName;
 
+  // Determine if a given extension download should be treated as if it came
+  // from the gallery.
+  static bool IsDownloadFromGallery(const GURL& download_url,
+                                    const GURL& referrer_url);
+
   ExtensionsService(Profile* profile,
                     const CommandLine* command_line,
                     PrefService* prefs,
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 2ac3299..c7325ad 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -362,10 +362,6 @@ void BrowserRenderProcessHost::ReceivedBadMessage(uint32 msg_type) {
   BadMessageTerminateProcess(msg_type, GetHandle());
 }
 
-void BrowserRenderProcessHost::PolicyViolated(const std::string& policy_name) {
-  PolicyViolationTerminateProcess(policy_name, GetHandle());
-}
-
 void BrowserRenderProcessHost::ViewCreated() {
   visited_link_updater_->ReceiverReady(this);
 }
@@ -804,19 +800,6 @@ void BrowserRenderProcessHost::BadMessageTerminateProcess(
   base::KillProcess(process, ResultCodes::KILLED_BAD_MESSAGE, false);
 }
 
-// Static. This function can be called from any thread.
-void BrowserRenderProcessHost::PolicyViolationTerminateProcess(
-    const std::string& policy_name, base::ProcessHandle process) {
-  LOG(ERROR) << "child process policy " << policy_name << " violated. "
-             << "terminating renderer.";
-  if (run_renderer_in_process()) {
-    // In single process mode it is better if we don't suicide but just crash.
-    CHECK(false);
-  }
-  NOTREACHED();
-  base::KillProcess(process, ResultCodes::KILLED_POLICY_VIOLATION, false);
-}
-
 void BrowserRenderProcessHost::OnChannelError() {
   // Our child process has died.  If we didn't expect it, it's a crash.
   // In any case, we need to let everyone know it's gone.
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index 89e4d82..cd94bf5 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -67,7 +67,6 @@ class BrowserRenderProcessHost : public RenderProcessHost,
                                const base::TimeDelta& max_delay,
                                IPC::Message* msg);
   virtual void ReceivedBadMessage(uint32 msg_type);
-  virtual void PolicyViolated(const std::string& policy_name);
   virtual void WidgetRestored();
   virtual void WidgetHidden();
   virtual void ViewCreated();
@@ -93,13 +92,6 @@ class BrowserRenderProcessHost : public RenderProcessHost,
   static void BadMessageTerminateProcess(uint32 msg_type,
                                          base::ProcessHandle renderer);
 
-  // Called to terminate a renderer which has violated the conditions of a
-  // security policy privilege. This function can be safely called from any
-  // thread.
-  static void PolicyViolationTerminateProcess(const std::string& policy_name,
-                                              base::ProcessHandle renderer);
-  
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
diff --git a/chrome/browser/renderer_host/mock_render_process_host.cc b/chrome/browser/renderer_host/mock_render_process_host.cc
index 96df560..8be0416 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.cc
+++ b/chrome/browser/renderer_host/mock_render_process_host.cc
@@ -41,10 +41,6 @@ void MockRenderProcessHost::ReceivedBadMessage(uint32 msg_type) {
   ++bad_msg_count_;
 }
 
-void MockRenderProcessHost::PolicyViolated(const std::string& policy_name) {
-  NOTIMPLEMENTED();
-}
-
 void MockRenderProcessHost::WidgetRestored() {
 }
 
diff --git a/chrome/browser/renderer_host/mock_render_process_host.h b/chrome/browser/renderer_host/mock_render_process_host.h
index 1ee1905..aa04651 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.h
+++ b/chrome/browser/renderer_host/mock_render_process_host.h
@@ -39,7 +39,6 @@ class MockRenderProcessHost : public RenderProcessHost {
                                const base::TimeDelta& max_delay,
                                IPC::Message* msg);
   virtual void ReceivedBadMessage(uint32 msg_type);
-  virtual void PolicyViolated(const std::string& policy_name);
   virtual void WidgetRestored();
   virtual void WidgetHidden();
   virtual void ViewCreated();
diff --git a/chrome/browser/renderer_host/render_process_host.cc b/chrome/browser/renderer_host/render_process_host.cc
index 7418a8b..5f9363e 100644
--- a/chrome/browser/renderer_host/render_process_host.cc
+++ b/chrome/browser/renderer_host/render_process_host.cc
@@ -59,20 +59,11 @@ static bool IsSuitableHost(RenderProcessHost* host, Profile* profile,
   if (host->profile() != profile)
     return false;
 
-  // We classify renderers according to their highest privilege, and try
-  // to group pages into renderers with similar privileges.
-  // Note: it may be possible for a renderer to have both DOMUI and EXTENSION
-  // privileges, in which case we call it an "extension" renderer.
-  // TYPE_EXTENSION_GALLERY should never be TYPE_DOMUI and/or TYPE_EXTENSION
-  // as well.
   RenderProcessHost::Type host_type = RenderProcessHost::TYPE_NORMAL;
-  if (ChildProcessSecurityPolicy::GetInstance()->
-          CanInstallExtensionsSilently(host->id()))
-    host_type = RenderProcessHost::TYPE_EXTENSION_GALLERY;
   if (ChildProcessSecurityPolicy::GetInstance()->HasDOMUIBindings(host->id()))
     host_type = RenderProcessHost::TYPE_DOMUI;
   if (ChildProcessSecurityPolicy::GetInstance()->
-          HasExtensionBindings(host->id()))
+        HasExtensionBindings(host->id()))
     host_type = RenderProcessHost::TYPE_EXTENSION;
 
   return host_type == type;
diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
index 0949ffb..aad1f83 100644
--- a/chrome/browser/renderer_host/render_process_host.h
+++ b/chrome/browser/renderer_host/render_process_host.h
@@ -38,16 +38,12 @@ class RenderProcessHost : public IPC::Channel::Sender,
 
   // We classify renderers according to their highest privilege, and try
   // to group pages into renderers with similar privileges.
-  // Note: it may be possible for a renderer to have both DOMUI and EXTENSION
-  // privileges, in which case we call it an "extension" renderer.
-  // TYPE_EXTENSION_GALLERY should never be TYPE_DOMUI and/or TYPE_EXTENSION
-  // as well.
+  // Note: it may be possible for a renderer to have multiple privileges,
+  // in which case we call it an "extension" renderer.
   enum Type {
-    TYPE_NORMAL,           // Normal renderer, no extra privileges.
-    TYPE_EXTENSION_GALLERY, // Renderer with silent extension installation
-                           // privileges.
-    TYPE_DOMUI,            // Renderer with DOMUI privileges, like New Tab.
-    TYPE_EXTENSION         // Renderer with extension privileges.
+    TYPE_NORMAL,     // Normal renderer, no extra privileges.
+    TYPE_DOMUI,      // Renderer with DOMUI privileges, like New Tab.
+    TYPE_EXTENSION,  // Renderer with extension privileges.
   };
 
   // Details for RENDERER_PROCESS_CLOSED notifications.
@@ -179,9 +175,6 @@ class RenderProcessHost : public IPC::Channel::Sender,
   // Called when a received message cannot be decoded.
   virtual void ReceivedBadMessage(uint32 msg_type) = 0;
 
-  // Called when a renderer security policy is violated.
-  virtual void PolicyViolated(const std::string& policy_name) = 0;
-
   // Track the count of visible widgets. Called by listeners to register and
   // unregister visibility.
   virtual void WidgetRestored() = 0;
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 070e317..b414aea 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/bindings_policy.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
@@ -967,14 +966,6 @@ void RenderViewHost::OnMsgNavigate(const IPC::Message& msg) {
   const int renderer_id = process()->id();
   ChildProcessSecurityPolicy* policy =
       ChildProcessSecurityPolicy::GetInstance();
-  // Gallery URLs are granted CanInstallExtensionsSilently. RenderView delegates
-  // navigations to & from gallery URLs to the browser process so it can swap
-  // processes and ensure that non-gallery URLs do not acquire this privilege.
-  // This is an extra-paranoid check on a privileged renderer navigating away.
-  if (policy->CanInstallExtensionsSilently(renderer_id) &&
-      !Extension::IsGalleryURL(validated_params.url)) {
-    process()->PolicyViolated("can_silently_install_extensions");
-  }
   // Without this check, an evil renderer can trick the browser into creating
   // a navigation entry for a banned URL.  If the user clicks the back button
   // followed by the forward button (or clicks reload, or round-trips through
diff --git a/chrome/browser/renderer_host/site_instance.cc b/chrome/browser/renderer_host/site_instance.cc
index 115845f..337ce3d 100644
--- a/chrome/browser/renderer_host/site_instance.cc
+++ b/chrome/browser/renderer_host/site_instance.cc
@@ -7,8 +7,6 @@
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/registry_controlled_domain.h"
@@ -117,16 +115,6 @@ GURL SiteInstance::GetSiteForURL(const GURL& url) {
   // URLs with no host should have an empty site.
   GURL site;
 
-  // Hack warning: Extension gallery URLs are special-cased here. Extension
-  // gallery pages are granted special privileges to install extensions without
-  // a warning dialog. It is important that no other URLs share the render
-  // with these privileges. However, since the gallery is a sub-domain of
-  // google.com, the SiteInstance is specially treated to avoid having other
-  // google.com subdomains be grouped with it. Generalizing this kind of special
-  // case in the future seems desirable if we come upon another similar need.
-  if (Extension::IsGalleryURL(url))
-    return GURL(extension_urls::kGalleryBrowsePrefix);
-
   // TODO(creis): For many protocols, we should just treat the scheme as the
   // site, since there is no host.  e.g., file:, about:, chrome:
 
@@ -176,10 +164,6 @@ bool SiteInstance::IsSameWebSite(const GURL& url1, const GURL& url2) {
   if (url1.scheme() != url2.scheme())
     return false;
 
-  // Hack. Special case Extension gallery URLs. See note in GetSiteForURL().
-  if (Extension::IsGalleryURL(url1) || Extension::IsGalleryURL(url2))
-    return Extension::IsGalleryURL(url1) && Extension::IsGalleryURL(url2);
-
   return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
 }
 
@@ -195,9 +179,6 @@ RenderProcessHost::Type SiteInstance::GetRendererType() {
   if (DOMUIFactory::HasDOMUIScheme(site_))
     return RenderProcessHost::TYPE_DOMUI;
 
-  if (Extension::IsGalleryURL(site_))
-    return RenderProcessHost::TYPE_EXTENSION_GALLERY;
-
   return RenderProcessHost::TYPE_NORMAL;
 }
 
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc
index 85de55a..e9e848f 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.cc
+++ b/chrome/browser/renderer_host/test/test_render_view_host.cc
@@ -15,11 +15,15 @@ TestRenderViewHost::TestRenderViewHost(SiteInstance* instance,
                                        RenderViewHostDelegate* delegate,
                                        int routing_id)
     : RenderViewHost(instance, delegate, routing_id),
-      render_view_created_(false) {
+      render_view_created_(false),
+      delete_counter_(NULL) {
   set_view(new TestRenderWidgetHostView(this));
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
+  if (delete_counter_)
+    ++*delete_counter_;
+
   // Since this isn't a traditional view, we have to delete it.
   delete view();
 }
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index 9d3b4f4..b1458a1 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -117,6 +117,11 @@ class TestRenderViewHost : public RenderViewHost {
   // This is a helper function for simulating the most common types of loads.
   void SendNavigate(int page_id, const GURL& url);
 
+  // If set, *delete_counter is incremented when this object destructs.
+  void set_delete_counter(int* delete_counter) {
+    delete_counter_ = delete_counter;
+  }
+
   // Sets whether the RenderView currently exists or not. This controls the
   // return value from IsRenderViewLive, which the rest of the system uses to
   // check whether the RenderView has crashed or not.
@@ -136,6 +141,9 @@ class TestRenderViewHost : public RenderViewHost {
   // respond to IsRenderViewLive appropriately.
   bool render_view_created_;
 
+  // See set_delete_counter() above. May be NULL.
+  int* delete_counter_;
+
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
 };
 
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index f44ac31..8622f39 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/render_messages.h"
@@ -302,12 +301,6 @@ bool RenderViewHostManager::ShouldSwapProcessesForNavigation(
       return true;
   }
 
-  // Extension gallery pages are granted special install privileges for
-  // extensions. Thus, gallery pages must be contained in a separate process.
-  if (Extension::IsGalleryURL(cur_entry->url()) != 
-      Extension::IsGalleryURL(new_entry->url()))
-    return true;
-  
   return false;
 }
 
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 9a0df89..964bff1 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/character_encoding.h"
-#include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
@@ -56,7 +55,6 @@
 #include "chrome/browser/thumbnail_store.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/notification_service.h"
@@ -2520,15 +2518,6 @@ bool TabContents::CreateRenderViewForRenderManager(
     render_view_host->AllowBindings(
         render_manager_.pending_dom_ui()->bindings());
 
-  // If the pending url is to an extensions gallery page, enable the silent
-  // install bindings privilege. It is important to enforce that this renderer
-  // never get used for non-gallery URLs.
-  if (!process()->run_renderer_in_process() &&
-      !process()->HasConnection() &&
-      Extension::IsGalleryURL(controller_.pending_entry()->url()))
-    ChildProcessSecurityPolicy::GetInstance()->GrantInstallExtensionsSilently(
-       render_view_host->process()->id());
-
   RenderWidgetHostView* rwh_view = view_->CreateViewForWidget(render_view_host);
 
   scoped_refptr<URLRequestContextGetter> request_context = request_context_;
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index e4cb6533..9b59406 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -13,10 +13,6 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/notification_service.h"
-#include "chrome/common/notification_type.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ -212,38 +208,6 @@ class TabContentsTest : public RenderViewHostTestHarness {
   ChromeThread ui_thread_;
 };
 
-// Used to block until a navigation completes.
-class RenderViewHostDeletedObserver : public NotificationObserver {
- public:
-  RenderViewHostDeletedObserver(TabContents* contents,
-                                RenderViewHost* render_view_host)
-      : render_view_host_(render_view_host),
-        deleted_(false) {
-    registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
-                   Source<TabContents>(contents));
-  }
-
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) {
-    if (type == NotificationType::RENDER_VIEW_HOST_DELETED &&
-        render_view_host_ == Details<RenderViewHost>(details).ptr()) {
-      deleted_ = true;
-    }
-  }
-
-  bool deleted() { return deleted_; }
-
- private:
-  NotificationRegistrar registrar_;
-
-  RenderViewHost* render_view_host_;
-
-  bool deleted_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewHostDeletedObserver);
-};
-
 // Test to make sure that title updates get stripped of whitespace.
 TEST_F(TabContentsTest, UpdateTitle) {
   ViewHostMsg_FrameNavigate_Params params;
@@ -313,7 +277,8 @@ TEST_F(TabContentsTest, SimpleNavigation) {
 TEST_F(TabContentsTest, CrossSiteBoundaries) {
   contents()->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = rvh();
-  RenderViewHostDeletedObserver orig_rvh_deleted_observer(contents(), orig_rvh);
+  int orig_rvh_delete_count = 0;
+  orig_rvh->set_delete_counter(&orig_rvh_delete_count);
   SiteInstance* instance1 = contents()->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
@@ -331,8 +296,8 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) {
   controller().LoadURL(url2, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents()->cross_navigation_pending());
   TestRenderViewHost* pending_rvh = contents()->pending_rvh();
-  RenderViewHostDeletedObserver pending_rvh_deleted_observer(contents(),
-                                                             pending_rvh);
+  int pending_rvh_delete_count = 0;
+  pending_rvh->set_delete_counter(&pending_rvh_delete_count);
 
   // DidNavigate from the pending page
   ViewHostMsg_FrameNavigate_Params params2;
@@ -344,7 +309,7 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) {
   EXPECT_EQ(pending_rvh, contents()->render_view_host());
   EXPECT_NE(instance1, instance2);
   EXPECT_TRUE(contents()->pending_rvh() == NULL);
-  EXPECT_TRUE(orig_rvh_deleted_observer.deleted());
+  EXPECT_EQ(orig_rvh_delete_count, 1);
 
   // Going back should switch SiteInstances again.  The first SiteInstance is
   // stored in the NavigationEntry, so it should be the same as at the start.
@@ -356,74 +321,17 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) {
   contents()->TestDidNavigate(goback_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(goback_rvh, contents()->render_view_host());
-  EXPECT_TRUE(pending_rvh_deleted_observer.deleted());
+  EXPECT_EQ(pending_rvh_delete_count, 1);
   EXPECT_EQ(instance1, contents()->GetSiteInstance());
 }
 
-// Test that extension gallery URLs are isolated into their own SiteInstance
-// (distinct, in particular, from other other *.google.com domains).
-TEST_F(TabContentsTest, IsolateGalleryURLs) {
-  contents()->transition_cross_site = true;
-  TestRenderViewHost* orig_rvh = rvh();
-  RenderViewHostDeletedObserver orig_rvh_deleted_observer(contents(), orig_rvh);
-  SiteInstance* instance1 = contents()->GetSiteInstance();
-
-  // Navigate to first non-gallery URL.
-  const GURL url("https://calendar.google.com");
-  controller().LoadURL(url, GURL(), PageTransition::TYPED);
-  ViewHostMsg_FrameNavigate_Params params1;
-  InitNavigateParams(&params1, 1, url);
-  contents()->TestDidNavigate(orig_rvh, params1);
-
-  EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(orig_rvh, contents()->render_view_host());
-
-  // Navigate to gallery browser url.
-  const GURL url2(extension_urls::kGalleryBrowsePrefix);
-  controller().LoadURL(url2, GURL(), PageTransition::TYPED);
-  EXPECT_TRUE(contents()->cross_navigation_pending());
-  TestRenderViewHost* pending_rvh = contents()->pending_rvh();
-  RenderViewHostDeletedObserver pending_rvh_deleted_observer(contents(),
-                                                             pending_rvh);
-
-  ViewHostMsg_FrameNavigate_Params params2;
-  InitNavigateParams(&params2, 1, url2);
-  contents()->TestDidNavigate(pending_rvh, params2);
-  SiteInstance* instance2 = contents()->GetSiteInstance();
-
-  EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(pending_rvh, contents()->render_view_host());
-  EXPECT_NE(instance1, instance2);
-  EXPECT_TRUE(contents()->pending_rvh() == NULL);
-  EXPECT_TRUE(orig_rvh_deleted_observer.deleted());
-
-  // Navigate again to another non-gallery google url
-  const GURL url3("https://mail.google.com");
-  controller().LoadURL(url3, GURL(), PageTransition::TYPED);
-  EXPECT_TRUE(contents()->cross_navigation_pending());
-  TestRenderViewHost* pending_rvh2 = contents()->pending_rvh();
-
-  ViewHostMsg_FrameNavigate_Params params3;
-  InitNavigateParams(&params3, 1, url3);
-  contents()->TestDidNavigate(pending_rvh2, params3);
-  SiteInstance* instance3 = contents()->GetSiteInstance();
-
-  EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(pending_rvh2, contents()->render_view_host());
-  EXPECT_NE(instance2, instance3);
-  // TODO(creis): This should actually be EXPECT_EQ. see crbug.com/29146.
-  // e.g. This first and third instances *should* be the same.
-  EXPECT_NE(instance1, instance3);
-  EXPECT_TRUE(contents()->pending_rvh() == NULL);
-  EXPECT_TRUE(pending_rvh_deleted_observer.deleted());
-}
-
 // Test that navigating across a site boundary after a crash creates a new
 // RVH without requiring a cross-site transition (i.e., PENDING state).
 TEST_F(TabContentsTest, CrossSiteBoundariesAfterCrash) {
   contents()->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = rvh();
-  RenderViewHostDeletedObserver orig_rvh_deleted_observer(contents(), orig_rvh);
+  int orig_rvh_delete_count = 0;
+  orig_rvh->set_delete_counter(&orig_rvh_delete_count);
   SiteInstance* instance1 = contents()->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
@@ -446,7 +354,7 @@ TEST_F(TabContentsTest, CrossSiteBoundariesAfterCrash) {
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_TRUE(contents()->pending_rvh() == NULL);
   EXPECT_NE(orig_rvh, new_rvh);
-  EXPECT_TRUE(orig_rvh_deleted_observer.deleted());
+  EXPECT_EQ(orig_rvh_delete_count, 1);
 
   // DidNavigate from the new page
   ViewHostMsg_FrameNavigate_Params params2;