Moving common_export.h to blink's public folder
common_export.h was kept out of public since it was not to be
directly included by users of blink's public API but that made
dependency tracking unnecessarily complicated and it was included
indirectly anyway since many public headers included it.
This patch moves the header to blink's public/common. It's still
not to be include by external blink API users, but there is also
no reason for them to do it. This allows us to remove the dependency
hacks and makes dependency checks easier.
Bug: 800764
Change-Id: I834f389f9c1871a5e1e66b2fa69477b7eb40e0a0
Reviewed-on: https://chromium-review.googlesource.com/c/1301467
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603654}diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn
index fe85dfef..197432e 100644
--- a/third_party/blink/common/BUILD.gn
+++ b/third_party/blink/common/BUILD.gn
@@ -24,7 +24,6 @@
"blob/blob_utils.cc",
"cache_storage/cache_storage_utils.cc",
"client_hints/client_hints.cc",
- "common_export.h",
"device_memory/approximated_device_memory.cc",
"dom_storage/session_storage_namespace_id.cc",
"download/download_stats.cc",
@@ -66,10 +65,6 @@
public_deps = [
"//third_party/blink/public/common:headers",
]
- allow_circular_includes_from = [
- # It's using common_export.h creating a circular dependency.
- "//third_party/blink/public/common:headers",
- ]
deps = [
"//base",
diff --git a/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h b/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
index 92f8b40b..8f8bfb9 100644
--- a/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
+++ b/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
@@ -8,7 +8,7 @@
#include <vector>
#include "mojo/public/cpp/bindings/enum_traits.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-shared.h"
diff --git a/third_party/blink/public/common/BUILD.gn b/third_party/blink/public/common/BUILD.gn
index bcb2eca..256e4c1 100644
--- a/third_party/blink/public/common/BUILD.gn
+++ b/third_party/blink/public/common/BUILD.gn
@@ -38,6 +38,7 @@
"blob/blob_utils.h",
"cache_storage/cache_storage_utils.h",
"client_hints/client_hints.h",
+ "common_export.h",
"device_memory/approximated_device_memory.h",
"dom_storage/session_storage_namespace_id.h",
"download/download_stats.h",
@@ -112,6 +113,10 @@
if (is_win) {
sources += [ "dwrite_rasterizer_support/dwrite_rasterizer_support.h" ]
}
+
+ # common_export.h is an implementation detail of component builds,
+ # not part of the public API.
+ public = sources - [ "common_export.h" ]
}
if (is_android) {
diff --git a/third_party/blink/public/common/DEPS b/third_party/blink/public/common/DEPS
index 5254372..c28e08f 100644
--- a/third_party/blink/public/common/DEPS
+++ b/third_party/blink/public/common/DEPS
@@ -15,8 +15,4 @@
"+third_party/blink/public/mojom",
"+ui/gfx/geometry",
"+url",
-
- # This file should not be included outside of blink, so it does not belong
- # in blink/public.
- "+third_party/blink/common/common_export.h",
]
diff --git a/third_party/blink/public/common/associated_interfaces/associated_interface_provider.h b/third_party/blink/public/common/associated_interfaces/associated_interface_provider.h
index 72eba5d..2606de7d 100644
--- a/third_party/blink/public/common/associated_interfaces/associated_interface_provider.h
+++ b/third_party/blink/public/common/associated_interfaces/associated_interface_provider.h
@@ -14,7 +14,7 @@
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
#include "mojo/public/cpp/bindings/associated_interface_request.h"
#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/mojom/associated_interfaces/associated_interfaces.mojom.h"
namespace blink {
diff --git a/third_party/blink/public/common/associated_interfaces/associated_interface_registry.h b/third_party/blink/public/common/associated_interfaces/associated_interface_registry.h
index 590786f..4c526728 100644
--- a/third_party/blink/public/common/associated_interfaces/associated_interface_registry.h
+++ b/third_party/blink/public/common/associated_interfaces/associated_interface_registry.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/associated_interface_request.h"
#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/blob/blob_utils.h b/third_party/blink/public/common/blob/blob_utils.h
index 93b165c3..585d273 100644
--- a/third_party/blink/public/common/blob/blob_utils.h
+++ b/third_party/blink/public/common/blob/blob_utils.h
@@ -9,7 +9,7 @@
#include <stdint.h>
#include <limits>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/cache_storage/cache_storage_utils.h b/third_party/blink/public/common/cache_storage/cache_storage_utils.h
index c7234ba..561b386 100644
--- a/third_party/blink/public/common/cache_storage/cache_storage_utils.h
+++ b/third_party/blink/public/common/cache_storage/cache_storage_utils.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_CACHE_STORAGE_CACHE_STORAGE_UTILS_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_CACHE_STORAGE_CACHE_STORAGE_UTILS_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
namespace cache_storage {
diff --git a/third_party/blink/public/common/client_hints/client_hints.h b/third_party/blink/public/common/client_hints/client_hints.h
index 6949e07..e3beead 100644
--- a/third_party/blink/public/common/client_hints/client_hints.h
+++ b/third_party/blink/public/common/client_hints/client_hints.h
@@ -7,7 +7,7 @@
#include <stddef.h>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/common/common_export.h b/third_party/blink/public/common/common_export.h
similarity index 75%
rename from third_party/blink/common/common_export.h
rename to third_party/blink/public/common/common_export.h
index 9d6c0dd..e9891f8 100644
--- a/third_party/blink/common/common_export.h
+++ b/third_party/blink/public/common/common_export.h
@@ -2,9 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BLINK_COMMON_COMMON_EXPORT_H_
-#define THIRD_PARTY_BLINK_COMMON_COMMON_EXPORT_H_
-//
+#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_COMMON_EXPORT_H_
+#define THIRD_PARTY_BLINK_PUBLIC_COMMON_COMMON_EXPORT_H_
+
+// This file is NOT to be included directly by code outside blink. It
+// is an implementation detail of component builds.
+
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
@@ -31,4 +34,4 @@
#define BLINK_COMMON_EXPORT_PRIVATE
#endif
-#endif // THIRD_PARTY_BLINK_COMMON_COMMON_EXPORT_H_
+#endif // THIRD_PARTY_BLINK_PUBLIC_COMMON_COMMON_EXPORT_H_
diff --git a/third_party/blink/public/common/device_memory/approximated_device_memory.h b/third_party/blink/public/common/device_memory/approximated_device_memory.h
index 193e059cb..2f1c813 100644
--- a/third_party/blink/public/common/device_memory/approximated_device_memory.h
+++ b/third_party/blink/public/common/device_memory/approximated_device_memory.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/dom_storage/session_storage_namespace_id.h b/third_party/blink/public/common/dom_storage/session_storage_namespace_id.h
index 5ac7635..10ea660 100644
--- a/third_party/blink/public/common/dom_storage/session_storage_namespace_id.h
+++ b/third_party/blink/public/common/dom_storage/session_storage_namespace_id.h
@@ -7,7 +7,7 @@
#include <string>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/download/download_stats.h b/third_party/blink/public/common/download/download_stats.h
index 49b1137..1c7ac6ec 100644
--- a/third_party/blink/public/common/download/download_stats.h
+++ b/third_party/blink/public/common/download/download_stats.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_DOWNLOAD_DOWNLOAD_STATS_H_
#include "base/macros.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/dwrite_rasterizer_support/dwrite_rasterizer_support.h b/third_party/blink/public/common/dwrite_rasterizer_support/dwrite_rasterizer_support.h
index c71262b..55e138d 100644
--- a/third_party/blink/public/common/dwrite_rasterizer_support/dwrite_rasterizer_support.h
+++ b/third_party/blink/public/common/dwrite_rasterizer_support/dwrite_rasterizer_support.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_DWRITE_RASTERIZER_SUPPORT_DWRITE_RASTERIZER_SUPPORT_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_DWRITE_RASTERIZER_SUPPORT_DWRITE_RASTERIZER_SUPPORT_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/experiments/memory_ablation_experiment.h b/third_party/blink/public/common/experiments/memory_ablation_experiment.h
index 2a973b8..0159ebd 100644
--- a/third_party/blink/public/common/experiments/memory_ablation_experiment.h
+++ b/third_party/blink/public/common/experiments/memory_ablation_experiment.h
@@ -9,7 +9,7 @@
#include "base/feature_list.h"
#include "base/memory/ref_counted.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace base {
class SequencedTaskRunner;
diff --git a/third_party/blink/public/common/feature_policy/feature_policy.h b/third_party/blink/public/common/feature_policy/feature_policy.h
index 0df3efd..f90a7ab 100644
--- a/third_party/blink/public/common/feature_policy/feature_policy.h
+++ b/third_party/blink/public/common/feature_policy/feature_policy.h
@@ -11,7 +11,7 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
#include "url/origin.h"
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
index f5712d6..5b99a2d 100644
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FEATURES_H_
#include "base/feature_list.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
namespace features {
diff --git a/third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h b/third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h
index 290f6c0..b29a0867 100644
--- a/third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h
+++ b/third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FONT_UNIQUE_NAME_LOOKUP_FONT_TABLE_MATCHER_H_
#include "base/memory/read_only_shared_memory_region.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/font_unique_name_lookup/font_unique_name_table.pb.h"
#include <stddef.h>
diff --git a/third_party/blink/public/common/font_unique_name_lookup/icu_fold_case_util.h b/third_party/blink/public/common/font_unique_name_lookup/icu_fold_case_util.h
index 86c94389..0ea2aa0 100644
--- a/third_party/blink/public/common/font_unique_name_lookup/icu_fold_case_util.h
+++ b/third_party/blink/public/common/font_unique_name_lookup/icu_fold_case_util.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FONT_UNIQUE_NAME_LOOKUP_ICU_FOLD_CASE_UTIL_H_
#include <string>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/frame/frame_owner_element_type.h b/third_party/blink/public/common/frame/frame_owner_element_type.h
index bea646a..d0cbf3c6 100644
--- a/third_party/blink/public/common/frame/frame_owner_element_type.h
+++ b/third_party/blink/public/common/frame/frame_owner_element_type.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_FRAME_OWNER_ELEMENT_TYPE_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_FRAME_OWNER_ELEMENT_TYPE_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/frame/user_activation_state.h b/third_party/blink/public/common/frame/user_activation_state.h
index 9cd138b..6d0558e 100644
--- a/third_party/blink/public/common/frame/user_activation_state.h
+++ b/third_party/blink/public/common/frame/user_activation_state.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_USER_ACTIVATION_STATE_H_
#include "base/time/time_override.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/indexeddb/indexeddb_key.h b/third_party/blink/public/common/indexeddb/indexeddb_key.h
index 78e891e..68672c92 100644
--- a/third_party/blink/public/common/indexeddb/indexeddb_key.h
+++ b/third_party/blink/public/common/indexeddb/indexeddb_key.h
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/strings/string16.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/indexeddb/web_idb_types.h"
namespace blink {
diff --git a/third_party/blink/public/common/indexeddb/indexeddb_key_path.h b/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
index cce15fd..e007115 100644
--- a/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
+++ b/third_party/blink/public/common/indexeddb/indexeddb_key_path.h
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/strings/string16.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/indexeddb/web_idb_types.h"
namespace blink {
diff --git a/third_party/blink/public/common/indexeddb/indexeddb_key_range.h b/third_party/blink/public/common/indexeddb/indexeddb_key_range.h
index e78f733..4af170f 100644
--- a/third_party/blink/public/common/indexeddb/indexeddb_key_range.h
+++ b/third_party/blink/public/common/indexeddb/indexeddb_key_range.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_INDEXEDDB_INDEXEDDB_KEY_RANGE_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_INDEXEDDB_INDEXEDDB_KEY_RANGE_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/indexeddb/indexeddb_key.h"
namespace blink {
diff --git a/third_party/blink/public/common/indexeddb/indexeddb_metadata.h b/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
index c4aa60771..3abdadf 100644
--- a/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
+++ b/third_party/blink/public/common/indexeddb/indexeddb_metadata.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/strings/string16.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/indexeddb/indexeddb_key_path.h"
namespace blink {
diff --git a/third_party/blink/public/common/indexeddb/indexeddb_mojom_traits.h b/third_party/blink/public/common/indexeddb/indexeddb_mojom_traits.h
index aaf49b2..583b2ba 100644
--- a/third_party/blink/public/common/indexeddb/indexeddb_mojom_traits.h
+++ b/third_party/blink/public/common/indexeddb/indexeddb_mojom_traits.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_INDEXEDDB_INDEXEDDB_MOJOM_TRAITS_H_
#include "base/containers/span.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/indexeddb/indexeddb_key.h"
#include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom.h"
diff --git a/third_party/blink/public/common/manifest/manifest.h b/third_party/blink/public/common/manifest/manifest.h
index 079a81d..60987e4 100644
--- a/third_party/blink/public/common/manifest/manifest.h
+++ b/third_party/blink/public/common/manifest/manifest.h
@@ -13,7 +13,7 @@
#include "base/optional.h"
#include "base/strings/nullable_string16.h"
#include "base/strings/string16.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/manifest/web_display_mode.h"
#include "third_party/blink/public/common/screen_orientation/web_screen_orientation_lock_type.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/third_party/blink/public/common/manifest/manifest.typemap b/third_party/blink/public/common/manifest/manifest.typemap
index e23fd69b..3fffe79 100644
--- a/third_party/blink/public/common/manifest/manifest.typemap
+++ b/third_party/blink/public/common/manifest/manifest.typemap
@@ -5,7 +5,7 @@
mojom = "//third_party/blink/public/mojom/manifest/manifest.mojom"
public_headers = [
"//third_party/blink/public/common/manifest/manifest.h",
- "//third_party/blink/common/common_export.h",
+ "//third_party/blink/public/common/common_export.h",
]
traits_headers =
[ "//third_party/blink/public/common/manifest/manifest_mojom_traits.h" ]
diff --git a/third_party/blink/public/common/manifest/manifest_mojom_traits.h b/third_party/blink/public/common/manifest/manifest_mojom_traits.h
index dce5831..5676b62 100644
--- a/third_party/blink/public/common/manifest/manifest_mojom_traits.h
+++ b/third_party/blink/public/common/manifest/manifest_mojom_traits.h
@@ -8,7 +8,7 @@
#include "third_party/blink/public/common/manifest/manifest.h"
#include "mojo/public/cpp/bindings/struct_traits.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/mojom/manifest/manifest.mojom.h"
namespace mojo {
diff --git a/third_party/blink/public/common/messaging/cloneable_message.h b/third_party/blink/public/common/messaging/cloneable_message.h
index 81f93d3..c1bac3ba 100644
--- a/third_party/blink/public/common/messaging/cloneable_message.h
+++ b/third_party/blink/public/common/messaging/cloneable_message.h
@@ -12,7 +12,7 @@
#include "base/optional.h"
#include "base/unguessable_token.h"
#include "mojo/public/cpp/bindings/struct_ptr.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/mojom/blob/serialized_blob.mojom.h"
namespace blink {
diff --git a/third_party/blink/public/common/messaging/message_port_channel.h b/third_party/blink/public/common/messaging/message_port_channel.h
index 4a09ab3f..de0900f 100644
--- a/third_party/blink/public/common/messaging/message_port_channel.h
+++ b/third_party/blink/public/common/messaging/message_port_channel.h
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/messaging/string_message_codec.h b/third_party/blink/public/common/messaging/string_message_codec.h
index b052d5e..c340123 100644
--- a/third_party/blink/public/common/messaging/string_message_codec.h
+++ b/third_party/blink/public/common/messaging/string_message_codec.h
@@ -7,7 +7,7 @@
#include <vector>
#include "base/strings/string16.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/messaging/transferable_message.h b/third_party/blink/public/common/messaging/transferable_message.h
index 6b61c13..78a3e2bb 100644
--- a/third_party/blink/public/common/messaging/transferable_message.h
+++ b/third_party/blink/public/common/messaging/transferable_message.h
@@ -9,7 +9,7 @@
#include "base/containers/span.h"
#include "base/macros.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/messaging/cloneable_message.h"
#include "third_party/blink/public/common/messaging/message_port_channel.h"
#include "third_party/blink/public/mojom/array_buffer/array_buffer_contents.mojom.h"
diff --git a/third_party/blink/public/common/mime_util/mime_util.h b/third_party/blink/public/common/mime_util/mime_util.h
index c8bbca6..814f5c4 100644
--- a/third_party/blink/public/common/mime_util/mime_util.h
+++ b/third_party/blink/public/common/mime_util/mime_util.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_MIME_UTIL_MIME_UTIL_H_
#include <string>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/notifications/notification_resources.h b/third_party/blink/public/common/notifications/notification_resources.h
index 6f6b71b..3494f5c4 100644
--- a/third_party/blink/public/common/notifications/notification_resources.h
+++ b/third_party/blink/public/common/notifications/notification_resources.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace blink {
diff --git a/third_party/blink/public/common/notifications/notification_struct_traits.h b/third_party/blink/public/common/notifications/notification_struct_traits.h
index d642c87a..142e67c 100644
--- a/third_party/blink/public/common/notifications/notification_struct_traits.h
+++ b/third_party/blink/public/common/notifications/notification_struct_traits.h
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/base/string16_mojom_traits.h"
#include "mojo/public/cpp/bindings/struct_traits.h"
#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/notifications/platform_notification_data.h"
#include "third_party/blink/public/mojom/notifications/notification.mojom.h"
#include "url/gurl.h"
diff --git a/third_party/blink/public/common/notifications/platform_notification_data.h b/third_party/blink/public/common/notifications/platform_notification_data.h
index c6131b2..06727e6 100644
--- a/third_party/blink/public/common/notifications/platform_notification_data.h
+++ b/third_party/blink/public/common/notifications/platform_notification_data.h
@@ -11,7 +11,7 @@
#include "base/strings/nullable_string16.h"
#include "base/strings/string16.h"
#include "base/time/time.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "url/gurl.h"
namespace blink {
diff --git a/third_party/blink/public/common/origin_policy/origin_policy.h b/third_party/blink/public/common/origin_policy/origin_policy.h
index 48c39f4..c86631c 100644
--- a/third_party/blink/public/common/origin_policy/origin_policy.h
+++ b/third_party/blink/public/common/origin_policy/origin_policy.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/strings/string_piece.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/origin_trials/trial_token.h b/third_party/blink/public/common/origin_trials/trial_token.h
index 154e56d..68d6546 100644
--- a/third_party/blink/public/common/origin_trials/trial_token.h
+++ b/third_party/blink/public/common/origin_trials/trial_token.h
@@ -10,7 +10,7 @@
#include "base/strings/string_piece.h"
#include "base/time/time.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "url/origin.h"
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
diff --git a/third_party/blink/public/common/origin_trials/trial_token_validator.h b/third_party/blink/public/common/origin_trials/trial_token_validator.h
index 6a7b164..188ce4de 100644
--- a/third_party/blink/public/common/origin_trials/trial_token_validator.h
+++ b/third_party/blink/public/common/origin_trials/trial_token_validator.h
@@ -12,7 +12,7 @@
#include "base/callback.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "url/origin.h"
namespace net {
diff --git a/third_party/blink/public/common/page/launching_process_state.h b/third_party/blink/public/common/page/launching_process_state.h
index 52e46cc0..0b07d18 100644
--- a/third_party/blink/public/common/page/launching_process_state.h
+++ b/third_party/blink/public/common/page/launching_process_state.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_LAUNCHING_PROCESS_STATE_H_
#include "build/build_config.h"
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/privacy_preferences.h b/third_party/blink/public/common/privacy_preferences.h
index 15df81e..efcadde 100644
--- a/third_party/blink/public/common/privacy_preferences.h
+++ b/third_party/blink/public/common/privacy_preferences.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_PRIVACY_PREFERENCES_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_PRIVACY_PREFERENCES_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/service_worker/service_worker_status_code.h b/third_party/blink/public/common/service_worker/service_worker_status_code.h
index 31baf1c..0414313 100644
--- a/third_party/blink/public/common/service_worker/service_worker_status_code.h
+++ b/third_party/blink/public/common/service_worker/service_worker_status_code.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_STATUS_CODE_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_STATUS_CODE_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/common/service_worker/service_worker_type_converters.h b/third_party/blink/public/common/service_worker/service_worker_type_converters.h
index cb3f431..a316bdd 100644
--- a/third_party/blink/public/common/service_worker/service_worker_type_converters.h
+++ b/third_party/blink/public/common/service_worker/service_worker_type_converters.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h"
diff --git a/third_party/blink/public/common/service_worker/service_worker_utils.h b/third_party/blink/public/common/service_worker/service_worker_utils.h
index 2acc433..00e5cc1a 100644
--- a/third_party/blink/public/common/service_worker/service_worker_utils.h
+++ b/third_party/blink/public/common/service_worker/service_worker_utils.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_UTILS_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_UTILS_H_
-#include "third_party/blink/common/common_export.h"
+#include "third_party/blink/public/common/common_export.h"
namespace blink {
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
index f61abec7..83d6e66 100644
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -85,7 +85,7 @@
export_class_attribute = "BLINK_COMMON_EXPORT"
export_define = "BLINK_COMMON_IMPLEMENTATION=1"
- export_header = "third_party/blink/common/common_export.h"
+ export_header = "third_party/blink/public/common/common_export.h"
export_class_attribute_blink = "PLATFORM_EXPORT"
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
@@ -105,7 +105,7 @@
export_class_attribute = "BLINK_COMMON_EXPORT"
export_define = "BLINK_COMMON_IMPLEMENTATION=1"
- export_header = "third_party/blink/common/common_export.h"
+ export_header = "third_party/blink/public/common/common_export.h"
export_class_attribute_blink = "PLATFORM_EXPORT"
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
@@ -153,7 +153,7 @@
export_class_attribute = "BLINK_COMMON_EXPORT"
export_define = "BLINK_COMMON_IMPLEMENTATION=1"
- export_header = "third_party/blink/common/common_export.h"
+ export_header = "third_party/blink/public/common/common_export.h"
export_class_attribute_blink = "CORE_EXPORT"
export_define_blink = "BLINK_CORE_IMPLEMENTATION=1"
@@ -188,7 +188,7 @@
export_class_attribute = "BLINK_COMMON_EXPORT"
export_define = "BLINK_COMMON_IMPLEMENTATION=1"
- export_header = "third_party/blink/common/common_export.h"
+ export_header = "third_party/blink/public/common/common_export.h"
export_class_attribute_blink = "MODULES_EXPORT"
export_define_blink = "BLINK_MODULES_IMPLEMENTATION=1"
diff --git a/third_party/blink/public/mojom/usb/BUILD.gn b/third_party/blink/public/mojom/usb/BUILD.gn
index 0e8769d..cfa109c 100644
--- a/third_party/blink/public/mojom/usb/BUILD.gn
+++ b/third_party/blink/public/mojom/usb/BUILD.gn
@@ -28,7 +28,7 @@
export_class_attribute = "BLINK_COMMON_EXPORT"
export_define = "BLINK_COMMON_IMPLEMENTATION=1"
- export_header = "third_party/blink/common/common_export.h"
+ export_header = "third_party/blink/public/common/common_export.h"
export_class_attribute_blink = "PLATFORM_EXPORT"
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
