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

chrome/browser/net/chrome_url_request_context.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 
-#include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/linked_ptr.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_policy.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/host_zoom_map.h"
@@ skipping 26 matching lines @@
 class ChromeURLRequestContext : public URLRequestContext {
  public:
   // Maintains some extension-related state we need on the IO thread.
   // TODO(aa): It would be cool if the Extension objects in ExtensionsService
   // could be immutable and ref-counted so that we could use them directly from
   // both threads. There is only a small amount of mutable state in Extension.
   struct ExtensionInfo {
     ExtensionInfo(const std::string& name, const FilePath& path,
                   const std::string& default_locale,
                   const ExtensionExtent& extent,
-                  const ExtensionExtent& effective_host_permissions,
                   const std::vector<std::string>& api_permissions)
         : name(name), path(path), default_locale(default_locale),
-          extent(extent),
-          effective_host_permissions(effective_host_permissions),
-          api_permissions(api_permissions) {
+          extent(extent), api_permissions(api_permissions) {
     }
     const std::string name;
-    const FilePath path;
-    const std::string default_locale;
-    const ExtensionExtent extent;
-    const ExtensionExtent effective_host_permissions;
+    FilePath path;
+    std::string default_locale;
+    ExtensionExtent extent;
     std::vector<std::string> api_permissions;
   };
 
   // Map of extension info by extension id.
   typedef std::map<std::string, linked_ptr<ExtensionInfo> > ExtensionInfoMap;
 
   ChromeURLRequestContext();
 
   // Gets the name for the specified extension.
   std::string GetNameForExtension(const std::string& id);
 
   // Gets the path to the directory for the specified extension.
   FilePath GetPathForExtension(const std::string& id);
 
   // Returns an empty string if the extension with |id| doesn't have a default
   // locale.
   std::string GetDefaultLocaleForExtension(const std::string& id);
 
-  // Gets the effective host permissions for the extension with |id|.
-  ExtensionExtent
-      GetEffectiveHostPermissionsForExtension(const std::string& id);
-
   // Determine whether a URL has access to the specified extension permission.
   bool CheckURLAccessToExtensionPermission(const GURL& url,
                                            const char* permission_name);
 
   // Gets the path to the directory user scripts are stored in.
   FilePath user_script_dir_path() const {
     return user_script_dir_path_;
   }
 
   // Gets the appcache service to be used for requests in this context.
@@ skipping 306 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextFactory);
 };
 
 // Creates a proxy configuration from proxy-related preferences fetched
 // from |pref_service|. The relevant preferences in |pref_service| are
 // initialized from the process' command line or by applicable proxy policies.
 net::ProxyConfig* CreateProxyConfig(const PrefService* pref_service);
 
 #endif  // CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_