| Index: third_party/WebKit/Source/platform/wtf/Assertions.h
|
| diff --git a/third_party/WebKit/Source/wtf/Assertions.h b/third_party/WebKit/Source/platform/wtf/Assertions.h
|
| similarity index 97%
|
| copy from third_party/WebKit/Source/wtf/Assertions.h
|
| copy to third_party/WebKit/Source/platform/wtf/Assertions.h
|
| index e9988799b3d19aaa213d11d649fd029ac223164e..37d122277696295cec820c0569b36cd691fa4dd7 100644
|
| --- a/third_party/WebKit/Source/wtf/Assertions.h
|
| +++ b/third_party/WebKit/Source/platform/wtf/Assertions.h
|
| @@ -37,10 +37,10 @@
|
| #include "base/allocator/partition_allocator/oom.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/logging.h"
|
| -#include "wtf/Compiler.h"
|
| -#include "wtf/Noncopyable.h"
|
| -#include "wtf/WTFExport.h"
|
| -#include "wtf/build_config.h"
|
| +#include "platform/wtf/Compiler.h"
|
| +#include "platform/wtf/Noncopyable.h"
|
| +#include "platform/wtf/WTFExport.h"
|
| +#include "platform/wtf/build_config.h"
|
|
|
| #if OS(WIN)
|
| #include <windows.h>
|
| @@ -51,7 +51,8 @@
|
| #endif
|
|
|
| // WTFLogAlways() is deprecated. crbug.com/638849
|
| -WTF_EXPORT PRINTF_FORMAT(1, 2) void WTFLogAlways(const char* format, ...);
|
| +WTF_EXPORT PRINTF_FORMAT(1, 2) // NOLINT
|
| + void WTFLogAlways(const char* format, ...);
|
|
|
| namespace WTF {
|
|
|
| @@ -84,9 +85,9 @@ class WTF_EXPORT ScopedLogger {
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(AssertionsTest, ScopedLogger);
|
| using PrintFunctionPtr = void (*)(const char* format, va_list args);
|
| - static void setPrintFuncForTests(PrintFunctionPtr p) {
|
| - m_printFunc = p;
|
| - } // Note: not thread safe.
|
| +
|
| + // Note: not thread safe.
|
| + static void setPrintFuncForTests(PrintFunctionPtr);
|
|
|
| void init(const char* format, va_list args);
|
| void writeNewlineIfNeeded();
|
|
|