Merged to M57.

chrome/browser/component_updater/chrome_component_updater_configurator.cc

Index: chrome/browser/component_updater/chrome_component_updater_configurator.cc
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
index ea83a735cc1d7d0f8010511e5689aeb418d62fe1..2fccab7600c25f879debd3408cc1d674928a4498 100644
--- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc
+++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
@@ -10,9 +10,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/version.h"
-#if defined(OS_WIN)
-#include "base/win/win_util.h"
-#endif
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
@@ -20,15 +18,17 @@
 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
-#if defined(OS_WIN)
-#include "chrome/installer/util/google_update_settings.h"
-#endif  // OS_WIN
 #include "components/component_updater/configurator_impl.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/update_client/update_query_params.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_WIN)
+#include "base/win/win_util.h"
+#include "chrome/installer/util/google_update_settings.h"
+#endif
+
 namespace component_updater {
 
 namespace {