Add a separate header file for DedicatedWorkerId and SharedWorkerId

A future CL will use those IDs without their associated worker
service.

Bug: 993029
Change-Id: I40391971b8ee673e00b8865a82bc6ce9b8d8f162
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148681
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759819}

chrome/browser/task_manager/providers/per_profile_worker_task_tracker.h

@@ -10,9 +10,11 @@
 #include "base/containers/flat_map.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/task_manager/providers/task.h"
+#include "content/public/browser/dedicated_worker_id.h"
 #include "content/public/browser/dedicated_worker_service.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_context_observer.h"
+#include "content/public/browser/shared_worker_id.h"
 #include "content/public/browser/shared_worker_service.h"
 
 class Profile;

components/performance_manager/worker_watcher.h

@@ -13,10 +13,12 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
+#include "content/public/browser/dedicated_worker_id.h"
 #include "content/public/browser/dedicated_worker_service.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_context_observer.h"
+#include "content/public/browser/shared_worker_id.h"
 #include "content/public/browser/shared_worker_service.h"
 
 namespace performance_manager {

content/browser/worker_host/dedicated_worker_host.h

@@ -11,7 +11,7 @@
 #include "base/scoped_observer.h"
 #include "build/build_config.h"
 #include "content/browser/browser_interface_broker_impl.h"
-#include "content/public/browser/dedicated_worker_service.h"
+#include "content/public/browser/dedicated_worker_id.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"

content/browser/worker_host/shared_worker_host.h

@@ -21,8 +21,8 @@
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
+#include "content/public/browser/shared_worker_id.h"
 #include "content/public/browser/shared_worker_instance.h"
-#include "content/public/browser/shared_worker_service.h"
 #include "media/mojo/mojom/video_decode_perf_history.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

content/public/browser/BUILD.gn

@@ -129,6 +129,7 @@ jumbo_source_set("browser_sources") {
     "cors_exempt_headers.h",
     "cors_origin_pattern_setter.cc",
     "cors_origin_pattern_setter.h",
+    "dedicated_worker_id.h",
     "dedicated_worker_service.h",
     "desktop_capture.cc",
     "desktop_capture.h",
@@ -322,6 +323,7 @@ jumbo_source_set("browser_sources") {
     "session_storage_namespace.h",
     "session_storage_usage_info.h",
     "shared_cors_origin_access_list.h",
+    "shared_worker_id.h",
     "shared_worker_instance.cc",
     "shared_worker_instance.h",
     "shared_worker_service.h",

content/public/browser/dedicated_worker_id.h

+// Copyright 2020 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 CONTENT_PUBLIC_BROWSER_DEDICATED_WORKER_ID_H_
+#define CONTENT_PUBLIC_BROWSER_DEDICATED_WORKER_ID_H_
+
+#include "base/util/type_safety/id_type.h"
+
+namespace content {
+
+using DedicatedWorkerId = util::IdType64<class DedicatedWorkerTag>;
+
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_BROWSER_DEDICATED_WORKER_ID_H_

content/public/browser/dedicated_worker_service.h

@@ -6,16 +6,14 @@
 #define CONTENT_PUBLIC_BROWSER_DEDICATED_WORKER_SERVICE_H_
 
 #include "base/observer_list_types.h"
-#include "base/util/type_safety/id_type.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/dedicated_worker_id.h"
 #include "content/public/browser/global_routing_id.h"
 
 class GURL;
 
 namespace content {
 
-using DedicatedWorkerId = util::IdType64<class DedicatedWorkerTag>;
-
 // An interface that allows to subscribe to the lifetime of dedicated workers.
 // The service is owned by the StoragePartition and lives on the UI thread.
 class CONTENT_EXPORT DedicatedWorkerService {

content/public/browser/shared_worker_id.h

+// Copyright 2020 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 CONTENT_PUBLIC_BROWSER_SHARED_WORKER_ID_H_
+#define CONTENT_PUBLIC_BROWSER_SHARED_WORKER_ID_H_
+
+#include "base/util/type_safety/id_type.h"
+
+namespace content {
+
+using SharedWorkerId = util::IdType64<class SharedWorkerTag>;
+
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_BROWSER_SHARED_WORKER_ID_H_

content/public/browser/shared_worker_service.h

@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/observer_list_types.h"
-#include "base/util/type_safety/id_type.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_routing_id.h"
+#include "content/public/browser/shared_worker_id.h"
 
 class GURL;
 
@@ -24,8 +24,6 @@ class Origin;
 
 namespace content {
 
-using SharedWorkerId = util::IdType64<class SharedWorkerTag>;
-
 // An interface for managing shared workers. These may be run in a separate
 // process, since multiple renderer processes can be talking to a single shared
 // worker. All the methods below can only be called on the UI thread.