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 d265c651dd135236d766915e00af87e92086cb6b..6cef70513fe0dc93672f53d925faf59861b9758e 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"
@@ -199,6 +198,10 @@
 #include "ui/aura/env.h"
 #endif
 
+#if defined(CLD_DATA_FROM_COMPONENT)
+#include "chrome/browser/component_updater/cld_component_installer.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
@@ -403,7 +406,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