Modularize Compact Language Detector 2 (CLD2) data sources

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index b0260a6fabfdff1bfaeef89667505d31332b5be5..8bc7c2acb6973c7f35e12828e7b77df7c05c74f9 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -42,7 +42,6 @@
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
-#include "chrome/browser/component_updater/cld_component_installer.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/flash_component_installer.h"
 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
@@ -184,6 +183,10 @@
 #include "chrome/browser/mac/keystone_glue.h"
 #endif
 
+#if defined(CLD_DATA_FROM_COMPONENT)
+#include "chrome/browser/component_updater/cld_component_installer.h"
+#endif
+
 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD)
 #include "printing/printed_document.h"
 #endif
@@ -404,7 +407,7 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
   g_browser_process->crl_set_fetcher()->DeleteFromDisk();
 #endif
 
-#if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT)
+#if defined(CLD_DATA_FROM_COMPONENT)
   RegisterCldComponent(cus);
 #endif