Merge pull request #8061 from /issues/14338

Drop chrome-common-chrome_content_client_constants.cc.patch

chromium_src/chrome/common/chrome_content_client.h

@@ -0,0 +1,22 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
+
+#define kPDFExtensionPluginName     \
+  kPDFExtensionPluginName_Unused[]; \
+  static const char kPDFExtensionPluginName
+
+#define kPDFInternalPluginName     \
+  kPDFInternalPluginName_Unused[]; \
+  static const char kPDFInternalPluginName
+
+#include "../../../../chrome/common/chrome_content_client.h"
+
+#undef kPDFExtensionPluginName
+#undef kPDFInternalPluginName
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_COMMON_CHROME_CONTENT_CLIENT_H_

chromium_src/chrome/common/chrome_content_client_constants.cc

@@ -0,0 +1,17 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/common/chrome_content_client.h"
+
+#define kPDFExtensionPluginName kPDFExtensionPluginName_Unused
+#define kPDFInternalPluginName kPDFInternalPluginName_Unused
+
+#include "../../../../chrome/common/chrome_content_client_constants.cc"
+
+#undef kPDFExtensionPluginName
+#undef kPDFInternalPluginName
+
+const char ChromeContentClient::kPDFExtensionPluginName[] = "Chrome PDF Viewer";
+const char ChromeContentClient::kPDFInternalPluginName[] = "Chrome PDF Plugin";