Activate the VariationsService for ChromeOS and ensure that it does not ping the server until the E…

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1408 matching lines @@
 #if defined(OS_MACOSX)
     // Call Recycle() here as late as possible, before going into the loop
     // because Start() will add things to it while creating the main window.
     if (parameters().autorelease_pool)
       parameters().autorelease_pool->Recycle();
 #endif
 
     RecordPreReadExperimentTime("Startup.BrowserOpenTabs",
                                 base::TimeTicks::Now() - browser_open_start);
 
-    // TODO(mad): Move this call in a proper place on CrOS.
-    // http://crosbug.com/17687
+    // If we're running tests (ui_task is non-null), then we don't want to
+    // call FetchLanguageListFromTranslateServer.

[Nikita (slow), 2012/09/10 14:48:55]

nit: Comment should be updated so that it doesn't mention only translate
service.

[SteveT, 2012/09/10 16:33:02]

Ah you're right. Should have left it the way it was before. Reverted.

+    if (parameters().ui_task == NULL) {
 #if !defined(OS_CHROMEOS)
-    // If we're running tests (ui_task is non-null), then we don't want to
-    // call FetchLanguageListFromTranslateServer or
-    // StartRepeatedVariationsSeedFetch.
-    if (parameters().ui_task == NULL) {
-      // Request new variations seed information from server.
-      browser_process_->variations_service()->
-          StartRepeatedVariationsSeedFetch();
-
+      // TODO(mad): Move this call in a proper place on CrOS.
+      // http://crosbug.com/17687
       if (translate_manager_ != NULL) {
         translate_manager_->FetchLanguageListFromTranslateServer(
             profile_->GetPrefs());
       }
+#endif
+      // Request new variations seed information from server.
+      browser_process_->variations_service()->
+          StartRepeatedVariationsSeedFetch();
     }
-#endif
 
     run_message_loop_ = true;
   } else {
     run_message_loop_ = false;
   }
   browser_creator_.reset();
 #endif  // !defined(OS_ANDROID)
 
   PostBrowserStart();
 
@@ skipping 171 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }