blob: 50b5ce0f49f2961ab24159551980de55c01ebfe0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
description: jumbo build has trouble with these namespaces
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.h
+++ b/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.h
@@ -81,8 +81,10 @@ class ExtensionSyncEventObserver : publi
} // namespace api
} // namespace chrome_apps
+namespace extensions {
template <>
-void extensions::BrowserContextKeyedAPIFactory<
+void BrowserContextKeyedAPIFactory<
chrome_apps::api::ExtensionSyncEventObserver>::DeclareFactoryDependencies();
+}
#endif // CHROME_BROWSER_APPS_PLATFORM_APPS_API_SYNC_FILE_SYSTEM_EXTENSION_SYNC_EVENT_OBSERVER_H_
--- a/third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h
+++ b/third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h
@@ -12,14 +12,20 @@
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
// Conversion from CString to TraceValue so that trace arguments can be strings.
+namespace base {
+namespace trace_event {
+
template <>
-struct base::trace_event::TraceValue::Helper<WTF::CString> {
+struct TraceValue::Helper<WTF::CString> {
static constexpr unsigned char kType = TRACE_VALUE_TYPE_COPY_STRING;
static inline void SetValue(TraceValue* v, const WTF::CString& value) {
v->as_string = value.data();
}
};
+} // namespace trace_event
+} // namespace base
+
namespace blink {
namespace trace_event {
--- a/gin/v8_platform.cc
+++ b/gin/v8_platform.cc
@@ -268,10 +268,13 @@ base::LazyInstance<PageAllocator>::Leaky
} // namespace gin
+namespace base {
+namespace trace_event {
+
// Allow std::unique_ptr<v8::ConvertableToTraceFormat> to be a valid
// initialization value for trace macros.
template <>
-struct base::trace_event::TraceValue::Helper<
+struct TraceValue::Helper<
std::unique_ptr<v8::ConvertableToTraceFormat>> {
static constexpr unsigned char kType = TRACE_VALUE_TYPE_CONVERTABLE;
static inline void SetValue(
@@ -284,6 +287,9 @@ struct base::trace_event::TraceValue::He
}
};
+} // namespace trace_event
+} // namespace base
+
namespace gin {
class V8Platform::TracingControllerImpl : public v8::TracingController {
|
