Remove dependency on language detection library.

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 06d96b999697129aeed62767366db4e9da211f25..34b436e094045d4fa5dd40538dcc6167f608f19c 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -46,7 +46,6 @@
 #include "chrome/browser/google/google_search_counter.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/jankometer.h"
-#include "chrome/browser/language_usage_metrics.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/metrics/field_trial_synchronizer.h"
 #include "chrome/browser/metrics/metrics_log.h"
@@ -122,6 +121,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
+#if !defined(OS_ANDROID)

[Nico, 2012/11/02 15:23:26]

Drive-by: Instead of gating this on OS_ANDROID, could you use a
enable_language_detection feature flag instead? (see build/common.gypi, for
example enable_printing for how that's done.) Then other ports, say iOS, only
have to change common.gypi instead of adding OS_IOS to all the places where
you're adding OS_ANDROID.

[nilesh, 2012/11/02 17:37:31]

Done.

+#include "chrome/browser/language_usage_metrics.h"
+#endif
+
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
@@ -1346,10 +1349,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   HandleTestParameters(parsed_command_line());
   RecordBreakpadStatusUMA(browser_process_->metrics_service());
   about_flags::RecordUMAStatistics(local_state_);
+#if !defined(OS_ANDROID)
+  // LanguageUsageMetrics needs third_party/cld/, which is excluded on Android.
   LanguageUsageMetrics::RecordAcceptLanguages(
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   LanguageUsageMetrics::RecordApplicationLanguage(
       browser_process_->GetApplicationLocale());
+#endif
 
   // The extension service may be available at this point. If the command line
   // specifies --uninstall-extension, attempt the uninstall extension startup