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

1 files changed, 1 insertions, 33 deletions

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_);