| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index dcf863d1f89a10a9078d6d48ac2a5a09f7b5e334..ab34cda844052ffe288539b11209621f87645480 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -163,6 +163,7 @@
|
| #include "net/http/http_stream_factory.h"
|
| #include "net/url_request/url_request.h"
|
| #include "printing/features/features.h"
|
| +#include "rlz/features/features.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/layout.h"
|
| #include "ui/base/material_design/material_design_controller.h"
|
| @@ -246,10 +247,10 @@
|
| #include "printing/printed_document.h"
|
| #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
|
|
|
| -#if defined(ENABLE_RLZ)
|
| +#if BUILDFLAG(ENABLE_RLZ)
|
| #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
|
| #include "components/rlz/rlz_tracker.h"
|
| -#endif // defined(ENABLE_RLZ)
|
| +#endif // BUILDFLAG(ENABLE_RLZ)
|
|
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| #include "chrome/browser/media/webrtc/webrtc_log_util.h"
|
| @@ -1708,7 +1709,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| }
|
| #endif // defined(OS_WIN)
|
|
|
| -#if defined(ENABLE_RLZ) && !defined(OS_CHROMEOS)
|
| +#if BUILDFLAG(ENABLE_RLZ) && !defined(OS_CHROMEOS)
|
| // Init the RLZ library. This just binds the dll and schedules a task on the
|
| // file thread to be run sometime later. If this is the first run we record
|
| // the installation event.
|
| @@ -1725,7 +1726,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_),
|
| ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_),
|
| ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_));
|
| -#endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS)
|
| +#endif // BUILDFLAG(ENABLE_RLZ) && !defined(OS_CHROMEOS)
|
|
|
| // Configure modules that need access to resources.
|
| net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
|
|
|