WebRequest API cleanup

extensions/browser/api/web_request/web_request_event_details.h

Index: extensions/browser/api/web_request/web_request_event_details.h
diff --git a/extensions/browser/api/web_request/web_request_event_details.h b/extensions/browser/api/web_request/web_request_event_details.h
new file mode 100644
index 0000000000000000000000000000000000000000..91e29bf8e13d0b91b78bf75e1b0300ae533ca412
--- /dev/null
+++ b/extensions/browser/api/web_request/web_request_event_details.h
@@ -0,0 +1,144 @@
+// Copyright 2016 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_EVENT_DETAILS_H_
+#define EXTENSIONS_BROWSER_API_WEB_REQUEST_WEB_REQUEST_EVENT_DETAILS_H_
+
+#include <string>
+
+#include "base/callback_forward.h"
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+
+namespace net {
+class AuthChallengeInfo;
+class HttpRequestHeaders;
+class HttpResponseHeaders;
+class URLRequest;
+}
+
+namespace extensions {
+
+// This helper class is used to construct the details for a webRequest event
+// dictionary. Some keys are present on every event, others are only relevant
+// for a few events. And some keys must only be added to the event details if
+// requested at the registration of the event listener (in ExtraInfoSpec).
+// This class provides setters that are aware of these rules.
+//
+// Not all keys are managed by this class. Keys that do not require a special
+// treatment can be set using the generic SetBoolean / SetInteger / SetString
+// methods (e.g. to set "error", "message", "redirectUrl", "stage" or "tabId").
+//
+// This class should be constructed on the IO thread. It can safely be used on
+// other threads, as long as there is no concurrent access.
+class WebRequestEventDetails {
+ public:
+  using DeterminedFrameIdCallback =
+      base::Callback<void(scoped_ptr<WebRequestEventDetails>)>;
+
+  // Create a WebRequestEventDetails with the following keys:
+  // - method
+  // - requestId
+  // - tabId
+  // - timeStamp
+  // - type
+  // - url
+  WebRequestEventDetails(const net::URLRequest* request, int extra_info_spec);
+  ~WebRequestEventDetails();
+
+  // Sets the following key:
+  // - requestBody (on demand)
+  void SetRequestBody(const net::URLRequest* request);
+
+  // Sets the following key:
+  // - requestHeaders (on demand)
+  void SetRequestHeaders(const net::HttpRequestHeaders& request_headers);
+
+  // Sets the following keys:
+  // - challenger
+  // - isProxy
+  // - realm
+  // - scheme
+  void SetAuthInfo(const net::AuthChallengeInfo& auth_info);
+
+  // Sets the following keys:
+  // - responseHeaders (on demand)
+  // - statusCode
+  // - statusLine
+  void SetResponseHeaders(const net::URLRequest* request,
+                          const net::HttpResponseHeaders* response_headers);
+
+  // Sets the following key:
+  // - fromCache
+  // - ip
+  void SetResponseSource(const net::URLRequest* request);
+
+  void SetBoolean(const std::string& key, bool value) {

[battre, 2016/01/12 13:08:03]

I think the style guide still asks to put the body into the .cc file, doesn't
it?

[robwu, 2016/01/12 16:33:05]

Trivial methods may be inlined. Since these SetBoolean methods are just aliases,
I inlined them.

https://google.github.io/styleguide/cppguide.html#Declaration_Order
https://google.github.io/styleguide/cppguide.html#Inline_Functions

I considered inheriting from DictionaryValue or making the internal dict public,
but then callers could erase keys or copy the result in an incorrect way, which
is something that I wanted to avoid.

[battre, 2016/01/12 19:05:21]

Ok, SGTM to leave it as is.

+    dict_.SetBoolean(key, value);
+  }
+
+  void SetInteger(const std::string& key, int value) {
+    dict_.SetInteger(key, value);
+  }
+
+  void SetString(const std::string& key, const std::string& value) {
+    dict_.SetString(key, value);
+  }
+
+  // Sets the following keys using information from constructor.
+  // - frameId
+  // - parentFrameId
+  // This must be called from the UI thread.
+  void DetermineFrameIdOnUI();
+
+  // Sets the following keys using information from constructor.
+  // - frameId
+  // - parentFrameId
+  //
+  // This method is more expensive than DetermineFrameIdOnUI because it may
+  // involve thread hops, so prefer using DetermineFrameIdOnUI() when possible.
+  // The callback is called as soon as these IDs are determined, which can be
+  // synchronous or asynchronous.
+  //
+  // The caller must not use or delete this WebRequestEventDetails instance
+  // after calling this method. Ownership of this instance is transferred to
+  // |callback|.
+  void DetermineFrameIdOnIO(const DeterminedFrameIdCallback& callback);
+
+  // Create an event dictionary that contains all required keys, and also the
+  // extra keys as specified by the |extra_info_spec| filter.
+  // This can be called from any thread.
+  scoped_ptr<base::DictionaryValue> GetFilteredDict(int extra_info_spec) const;
+
+  // Get the internal dictionary, unfiltered. After this call, the internal
+  // dictionary is empty.
+  scoped_ptr<base::DictionaryValue> GetAndClearDict();
+
+ private:
+  void OnDeterminedFrameId(scoped_ptr<WebRequestEventDetails> self,
+                           const DeterminedFrameIdCallback& callback,
+                           int extension_api_frame_id,
+                           int extension_api_parent_frame_id);
+
+  // The details that are always included in a webRequest event object.
+  base::DictionaryValue dict_;
+
+  // Extra event details: Only included when |extra_info_spec_| matches.
+  scoped_ptr<base::DictionaryValue> request_body_;
+  scoped_ptr<base::ListValue> request_headers_;
+  scoped_ptr<base::ListValue> response_headers_;
+
+  int extra_info_spec_;
+
+  // Used to determine the frameId and parentFrameId.
+  int render_process_id_;
+  int render_frame_id_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebRequestEventDetails);
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_API_WEB_REQUEST_WEB_REQUEST_EVENT_DETAILS_H_