WebRequest API cleanup

extensions/browser/api/web_request/web_request_api.h

 // Copyright (c) 2012 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 EXTENSIONS_BROWSER_API_WEB_REQUEST_WEB_REQUEST_API_H_
 #define EXTENSIONS_BROWSER_API_WEB_REQUEST_WEB_REQUEST_API_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 39 matching lines @@
 class AuthChallengeInfo;
 class AuthCredentials;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class URLRequest;
 }
 
 namespace extensions {
 
 class InfoMap;
+class WebRequestEventDetails;
 class WebRequestRulesRegistry;
 class WebRequestEventRouterDelegate;
 
 // Support class for the WebRequest API. Lives on the UI thread. Most of the
 // work is done by ExtensionWebRequestEventRouter below. This class observes
 // extensions::EventRouter to deal with event listeners. There is one instance
 // per BrowserContext which is shared with incognito.
 class WebRequestAPI : public BrowserContextKeyedAPI,
                       public EventRouter::Observer {
  public:
@@ skipping 50 matching lines @@
     // an error message is provided, otherwise the error is internal (and
     // unexpected).
     bool InitFromValue(const base::DictionaryValue& value, std::string* error);
 
     extensions::URLPatternSet urls;
     std::vector<content::ResourceType> types;
     int tab_id;
     int window_id;
   };
 
-  // Internal representation of the extraInfoSpec parameter on webRequest
-  // events, used to specify extra information to be included with network
-  // events.
-  struct ExtraInfoSpec {
-    enum Flags {
-      REQUEST_HEADERS = 1<<0,
-      RESPONSE_HEADERS = 1<<1,
-      BLOCKING = 1<<2,
-      ASYNC_BLOCKING = 1<<3,
-      REQUEST_BODY = 1<<4,
-    };
-
-    static bool InitFromValue(const base::ListValue& value,
-                              int* extra_info_spec);
-  };
-
   // Contains an extension's response to a blocking event.
   struct EventResponse {
     EventResponse(const std::string& extension_id,
                   const base::Time& extension_install_time);
     ~EventResponse();
 
     // ID of the extension that sent this response.
     std::string extension_id;
 
     // The time that the extension was installed. Used for deciding order of
@@ skipping 173 matching lines @@
   using CrossBrowserContextMap = std::map<void*, std::pair<bool, void*>>;
   using CallbacksForPageLoad = std::list<base::Closure>;
 
   ExtensionWebRequestEventRouter();
   ~ExtensionWebRequestEventRouter();
 
   // Ensures that future callbacks for |request| are ignored so that it can be
   // destroyed safely.
   void ClearPendingCallbacks(const net::URLRequest* request);
 
-  bool DispatchEvent(
-      void* browser_context,
-      net::URLRequest* request,
-      const std::vector<const EventListener*>& listeners,
-      const base::ListValue& args);
+  bool DispatchEvent(void* browser_context,
+                     net::URLRequest* request,
+                     const std::vector<const EventListener*>& listeners,
+                     scoped_ptr<WebRequestEventDetails> event_details);
 
   void DispatchEventToListeners(
       void* browser_context,
       scoped_ptr<std::vector<EventListener>> listeners,
-      base::DictionaryValue* dict,
-      int extension_api_frame_id,
-      int extension_api_parent_frame_id);
+      scoped_ptr<WebRequestEventDetails> event_details);
 
   // Returns a list of event listeners that care about the given event, based
   // on their filter parameters. |extra_info_spec| will contain the combined
   // set of extra_info_spec flags that every matching listener asked for.
   std::vector<const EventListener*> GetMatchingListeners(
       void* browser_context,
       const extensions::InfoMap* extension_info_map,
       const std::string& event_name,
       const net::URLRequest* request,
       int* extra_info_spec);
@@ skipping 66 matching lines @@
   void SendMessages(
       void* browser_context, const BlockedRequest& blocked_request);
 
   // Called when the RulesRegistry is ready to unblock a request that was
   // waiting for said event.
   void OnRulesRegistryReady(void* browser_context,
                             const std::string& event_name,
                             uint64_t request_id,
                             extensions::RequestStage request_stage);
 
-  // Extracts from |request| information for the keys requestId, url, method,
-  // frameId, tabId, type, and timeStamp and writes these into |out| to be
-  // passed on to extensions.
-  void ExtractRequestInfo(const net::URLRequest* request,
-                          base::DictionaryValue* out);
+  // Returns event details for a given request.
+  scoped_ptr<WebRequestEventDetails> CreateEventDetails(
+      const net::URLRequest* request,
+      int extra_info_spec);
 
   // Sets the flag that |event_type| has been signaled for |request_id|.
   // Returns the value of the flag before setting it.
   bool GetAndSetSignaled(uint64_t request_id, EventTypes event_type);
 
   // Clears the flag that |event_type| has been signaled for |request_id|.
   void ClearSignaled(uint64_t request_id, EventTypes event_type);
 
   // Returns whether |request| represents a top level window navigation.
   bool IsPageLoad(const net::URLRequest* request) const;
@@ skipping 110 matching lines @@
       extensions::QuotaLimitHeuristics* heuristics) const override;
   // Handle quota exceeded gracefully: Only warn the user but still execute the
   // function.
   void OnQuotaExceeded(const std::string& error) override;
   bool RunSync() override;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_WEB_REQUEST_WEB_REQUEST_API_H_