[OnionSoup] Clean up content/common/service_worker/service_worker_types.h

This CL removes those unnecessary things from
content/common/service_worker/service_worker_types.h, follow-up CLs will
remove all dependencies on it from all code other than
content/browser/service_worker/, then move/merge it into
content/browser/service_worker/ finally.

BUG=789854

Change-Id: Ied002b16718d345bd038f11c4486d703cdc4bdfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1692206Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Commit-Queue: Leon Han <leon.han@intel.com>
Cr-Commit-Position: refs/heads/master@{#676327}

chrome/browser/chrome_service_worker_browsertest.cc

@@ -49,6 +49,7 @@
 #include "net/test/embedded_test_server/http_response.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/blink/public/common/messaging/string_message_codec.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
 
 namespace chrome_service_worker_browser_test {
 

content/browser/background_fetch/background_fetch_request_info.h

@@ -21,6 +21,7 @@
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/background_fetch_response.h"
+#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
 #include "url/gurl.h"
 
 namespace storage {

content/browser/background_fetch/background_fetch_request_match_params.h

@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_REQUEST_MATCH_PARAMS_H_
 
 #include "base/optional.h"
-#include "content/common/service_worker/service_worker_types.h"
+#include "content/common/content_export.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
 
 namespace content {

content/browser/service_worker/service_worker_database.h

@@ -24,6 +24,7 @@
 #include "content/common/service_worker/service_worker_types.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
 #include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
 #include "third_party/blink/public/mojom/web_feature/web_feature.mojom.h"
 #include "url/gurl.h"
 #include "url/origin.h"

content/common/service_worker/service_worker_types.cc

@@ -4,8 +4,6 @@
 
 #include "content/common/service_worker/service_worker_types.h"
 
-#include "net/base/load_flags.h"
-
 namespace content {
 
 const char kServiceWorkerRegisterErrorPrefix[] =

content/common/service_worker/service_worker_types.h

@@ -5,32 +5,11 @@
 #ifndef CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 #define CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 
-#include <stdint.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/strings/string_util.h"
 #include "base/time/time.h"
-#include "content/common/content_export.h"
-#include "content/public/common/referrer.h"
-#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
-#include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_client.mojom.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_object.mojom.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_state.mojom.h"
-#include "url/gurl.h"
 
 // This file is to have common definitions that are to be shared by
 // browser and child process.
 
-namespace storage {
-class BlobHandle;
-}
-
 namespace content {
 
 // Indicates the document main thread ID in the child process. This is used for
@@ -61,8 +40,6 @@ static const int64_t kInvalidServiceWorkerResourceId = -1;
 static constexpr base::TimeDelta kServiceWorkerScriptMaxCacheAge =
     base::TimeDelta::FromHours(24);
 
-using ServiceWorkerHeaderList = std::vector<std::string>;
-
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_

content/common/service_worker/service_worker_utils.h

@@ -19,6 +19,8 @@
 #include "net/http/http_request_headers.h"
 #include "third_party/blink/public/common/fetch/fetch_api_request_headers_map.h"
 #include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
+#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
 #include "url/gurl.h"
 
 namespace content {

content/renderer/loader/web_worker_fetch_context_impl.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/synchronization/waitable_event.h"
+#include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "ipc/ipc_message.h"
 #include "mojo/public/cpp/bindings/binding.h"

content/renderer/service_worker/service_worker_context_client.h

@@ -18,6 +18,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
+#include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "ipc/ipc_listener.h"
 #include "mojo/public/cpp/bindings/binding.h"

content/renderer/service_worker/web_service_worker_provider_impl.h

@@ -11,6 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "third_party/blink/public/common/messaging/transferable_message.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_error_type.mojom.h"