| commit | 356b304474c643e8064db763b97101100597bddd | [log] [tgz] |
|---|---|---|
| author | Nico Weber <[email protected]> | Fri Aug 23 15:30:41 2019 |
| committer | Commit Bot <[email protected]> | Fri Aug 23 15:30:41 2019 |
| tree | f0bf22144d4663bdcb96c457c6e06ace80e1b911 | |
| parent | 1660744fdbf0e0f62d84de19f7f8ae6e03d41c0f [diff] [blame] |
Remove all references to GOOGLE_CHROME_BUILD in components/ Bug: 961769 Change-Id: I5190c5a6b5eae4a1a7ffb9ee0fc0f52ed29186d5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1762762 Commit-Queue: Nico Weber <[email protected]> Reviewed-by: Robert Sesek <[email protected]> Auto-Submit: Nico Weber <[email protected]> Cr-Commit-Position: refs/heads/master@{#689933}
diff --git a/components/update_client/protocol_serializer_json.cc b/components/update_client/protocol_serializer_json.cc index b94d2c05..8e7aee8 100644 --- a/components/update_client/protocol_serializer_json.cc +++ b/components/update_client/protocol_serializer_json.cc
@@ -10,8 +10,8 @@ #include "base/json/json_writer.h" #include "base/values.h" +#include "build/branding_buildflags.h" #include "build/build_config.h" - #include "components/update_client/updater_state.h" namespace update_client { @@ -67,7 +67,7 @@ if (!request.os.service_pack.empty()) os_node->SetKey("sp", Value(request.os.service_pack)); -#if defined(GOOGLE_CHROME_BUILD) +#if BUILDFLAG(GOOGLE_CHROME_BRANDING) if (request.updater) { const auto& updater = *request.updater; auto* updater_node =