Replace some GOOGLE_CHROME_BUILD with BUILDFLAG(GOOGLE_CHROME_BRANDING) in chrome/browser.
No intended behavior change.
TBR=rdevlin
Bug: 961769
Change-Id: I478dea8583b6cf8870812197f61a43207ef9e587
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1752626
Commit-Queue: Nico Weber <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Auto-Submit: Nico Weber <[email protected]>
Cr-Commit-Position: refs/heads/master@{#686664}
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc
index 4c90434..865ca928 100644
--- a/chrome/browser/plugins/plugin_info_host_impl.cc
+++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -16,6 +16,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
#include "base/task_runner_util.h"
+#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -327,11 +328,11 @@
std::vector<std::string> mime_types;
PluginService::GetInstance()->GetPluginInfoArray(
url, mime_type, allow_wildcard, &matching_plugins, &mime_types);
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
base::EraseIf(matching_plugins, [&](const WebPluginInfo& info) {
return info.path.value() == ChromeContentClient::kNotPresent;
});
-#endif // defined(GOOGLE_CHROME_BUILD)
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (matching_plugins.empty()) {
*status = chrome::mojom::PluginStatus::kNotFound;
return false;
