Fix most remaining WebUI link errors on Android.

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 6413b349932f26dbe22459226e5253a616d41966..7c0badd684cccf9b1eca09d63cdd0099f5d395a5 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1294,9 +1294,12 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs))
     WarnAboutMinimumSystemRequirements();
 
-  // Convert active labs into switches. Modifies the current command line.
+#if !defined(OS_ANDROID)
+  // Convert active labs into switches. Modifies the current command line. Not
+  // needed on Android as there aren't experimental flags.
   about_flags::ConvertFlagsToSwitches(local_state_,
                                       CommandLine::ForCurrentProcess());
+#endif
   local_state_->UpdateCommandLinePrefStore(CommandLine::ForCurrentProcess());

[Yaron, 2012/03/27 19:06:52]

It's not clear to me if this should be in the if-def as well. It seems like it's
for applying the changes that were made to the commandline but I don't know if
there's an implicit dep on this running from elsewhere.

 
   // Reset the command line in the crash report details, since we may have
@@ -1706,7 +1709,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 
   HandleTestParameters(parsed_command_line());
   RecordBreakpadStatusUMA(browser_process_->metrics_service());
+#if !defined(OS_ANDROID)
   about_flags::RecordUMAStatistics(local_state_);
+#endif
   LanguageUsageMetrics::RecordAcceptLanguages(
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   LanguageUsageMetrics::RecordApplicationLanguage(