Internal change
PiperOrigin-RevId: 348469945
Change-Id: I2fcf0cb076617b78323ce6101e1f92ef0ff8409c
diff --git a/patch/patches/google3_compatibility.patch b/patch/patches/google3_compatibility.patch
index ae94e8e..7886668 100644
--- a/patch/patches/google3_compatibility.patch
+++ b/patch/patches/google3_compatibility.patch
@@ -186,16 +186,16 @@
index 8d8bb889e..fef75d78b 100644
--- include/base/cef_logging.h
+++ include/base/cef_logging.h
-@@ -136,7 +136,7 @@
- #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
- #pragma once
-
--#if defined(DCHECK)
-+#if defined(DCHECK) && !defined(USING_GOOGLE3_INCLUDES)
+@@ -140,7 +140,7 @@
+ // When building CEF include the Chromium header directly.
+ #include "base/logging.h"
+ #include "base/notreached.h"
+-#elif defined(DCHECK)
++#elif defined(DCHECK) && !defined(USING_GOOGLE3_INCLUDES)
// Do nothing if the macros provided by this header already exist.
// This can happen in cases where Chromium code is used directly by the
// client application. When using Chromium code directly always include
-@@ -162,6 +162,12 @@
+@@ -163,6 +163,12 @@
#include <sstream>
#include <string>
@@ -208,7 +208,7 @@
#include "include/base/cef_build.h"
#include "include/base/cef_macros.h"
#include "include/internal/cef_logging_internal.h"
-@@ -198,6 +204,8 @@ const LogSeverity LOG_DFATAL = LOG_ERROR;
+@@ -199,6 +205,8 @@
const LogSeverity LOG_DFATAL = LOG_FATAL;
#endif
@@ -217,7 +217,7 @@
// A few definitions of macros that don't generate much code. These are used
// by LOG() and LOG_IF, etc. Since these are used all over our code, it's
// better to have compact code for these operations.
-@@ -355,6 +363,8 @@ const LogSeverity LOG_0 = LOG_ERROR;
+@@ -356,6 +364,8 @@
(val1), (val2), #val1 " " #op " " #val2)) \
cef::logging::LogMessage(__FILE__, __LINE__, _result).stream()
@@ -226,7 +226,7 @@
// Build the error message string. This is separate from the "Impl"
// function template because it is not performance critical and so can
// be out of line, while the "Impl" code should be inline. Caller
-@@ -392,6 +402,8 @@ extern template std::string* MakeCheckOpString<std::string, std::string>(
+@@ -393,6 +403,8 @@
const char* name);
#endif
@@ -235,7 +235,7 @@
// Helper functions for CHECK_OP macro.
// The (int, int) specialization works around the issue that the compiler
// will not instantiate the template version of the function on values of
-@@ -432,12 +444,16 @@ DEFINE_CHECK_OP_IMPL(GT, >)
+@@ -433,12 +445,16 @@
#define ENABLE_DLOG 1
#endif
@@ -252,7 +252,7 @@
// Definitions for DLOG et al.
#if ENABLE_DLOG
-@@ -553,6 +569,8 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
+@@ -554,6 +570,8 @@
#define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
#define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)
@@ -261,7 +261,7 @@
#if defined(NDEBUG) && defined(OS_CHROMEOS)
#define NOTREACHED() \
LOG(ERROR) << "NOTREACHED() hit in " << __FUNCTION__ << ". "
-@@ -560,10 +578,14 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
+@@ -561,10 +579,14 @@
#define NOTREACHED() DCHECK(false)
#endif
@@ -276,7 +276,7 @@
// This class more or less represents a particular log message. You
// create an instance of LogMessage and then stream stuff to it.
// When you finish streaming to it, ~LogMessage is called and the
-@@ -706,6 +728,8 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
+@@ -707,6 +729,8 @@
return out << wstr.c_str();
}
@@ -285,7 +285,7 @@
// The NOTIMPLEMENTED() macro annotates codepaths which have
// not been implemented yet.
//
-@@ -755,6 +779,8 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
+@@ -756,6 +780,8 @@
EAT_STREAM_PARAMETERS
#endif
