Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and i...

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2010 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/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
@@ skipping 780 matching lines @@
 std::string ChromeURLRequestContext::GetDefaultLocaleForExtension(
     const std::string& id) {
   ExtensionInfoMap::iterator iter = extension_info_.find(id);
   std::string result;
   if (iter != extension_info_.end())
     result = iter->second->default_locale;
 
   return result;
 }
 
-ExtensionExtent
-    ChromeURLRequestContext::GetEffectiveHostPermissionsForExtension(
-        const std::string& id) {
-  ExtensionInfoMap::iterator iter = extension_info_.find(id);
-  ExtensionExtent result;
-  if (iter != extension_info_.end())
-    result = iter->second->effective_host_permissions;
-
-  return result;
-}
-
 bool ChromeURLRequestContext::CheckURLAccessToExtensionPermission(
     const GURL& url,
     const char* permission_name) {
   ExtensionInfoMap::iterator info;
   if (url.SchemeIs(chrome::kExtensionScheme)) {
     // If the url is an extension scheme, we just look it up by extension id.
     std::string id = url.host();
     info = extension_info_.find(id);
   } else {
     // Otherwise, we scan for a matching extent. Overlapping extents are
@@ skipping 144 matching lines @@
         profile->GetExtensionsService()->extensions();
     for (ExtensionList::const_iterator iter = extensions->begin();
         iter != extensions->end(); ++iter) {
       extension_info_[(*iter)->id()] =
           linked_ptr<ChromeURLRequestContext::ExtensionInfo>(
               new ChromeURLRequestContext::ExtensionInfo(
                   (*iter)->name(),
                   (*iter)->path(),
                   (*iter)->default_locale(),
                   (*iter)->web_extent(),
-                  (*iter)->GetEffectiveHostPermissions(),
                   (*iter)->api_permissions()));
     }
   }
 
   if (profile->GetUserScriptMaster())
     user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir();
 
   ssl_config_service_ = profile->GetSSLConfigService();
 
   profile_dir_path_ = profile->GetPath();
@@ skipping 71 matching lines @@
       prefs::kProxyAutoDetect));
 
   if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {
     std::string proxy_bypass =
         pref_service->GetString(prefs::kProxyBypassList);
     proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
   }
 
   return proxy_config;
 }