Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chrome_browser_field_trials_desktop.cc

diff --git a/src/chrome/browser/chrome_browser_field_trials_desktop.cc b/src/chrome/browser/chrome_browser_field_trials_desktop.cc
index 29871de..ce62911 100644 (file)
--- a/src/chrome/browser/chrome_browser_field_trials_desktop.cc
+++ b/src/chrome/browser/chrome_browser_field_trials_desktop.cc
@@ -12,8 +12,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/auto_launch_trial.h"
-#include "chrome/browser/google/google_util.h"
-#include "chrome/browser/omnibox/omnibox_field_trial.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
@@ -22,23 +21,19 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/variations/variations_util.h"
 #include "content/public/common/content_constants.h"
 #include "net/spdy/spdy_session.h"
 #include "ui/base/layout.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/user_manager.h"
-#endif
-
 namespace chrome {
 
 namespace {
 
 void AutoLaunchChromeFieldTrial() {
   std::string brand;
-  google_util::GetBrand(&brand);
+  google_brand::GetBrand(&brand);
 
   // Create a 100% field trial based on the brand code.
   if (auto_launch_trial::IsInExperimentGroup(brand)) {
@@ -115,31 +110,16 @@ void SetupPreReadFieldTrial() {
   trial->group();
 }
 
-#if defined(OS_CHROMEOS)
-void SetupChromeOSMultiProfilesAllowedTrial() {
-  const char kTrialName[] = "ChromeOSMultiProfilesAllowed";
-  if (chromeos::UserManager::IsMultipleProfilesAllowed())
-    base::FieldTrialList::CreateFieldTrial(kTrialName, "allowed")->group();
-  else
-    base::FieldTrialList::CreateFieldTrial(kTrialName, "not_allowed")->group();
-}
-#endif  // defined(OS_CHROMEOS)
-
 }  // namespace
 
 void SetupDesktopFieldTrials(const CommandLine& parsed_command_line,
-                             const base::Time& install_time,
                              PrefService* local_state) {
   prerender::ConfigurePrerender(parsed_command_line);
   AutoLaunchChromeFieldTrial();
-  OmniboxFieldTrial::ActivateStaticTrials();
   SetupInfiniteCacheFieldTrial();
   DisableShowProfileSwitcherTrialIfNecessary();
   SetupShowAppLauncherPromoFieldTrial(local_state);
   SetupPreReadFieldTrial();
-#if defined(OS_CHROMEOS)
-  SetupChromeOSMultiProfilesAllowedTrial();
-#endif
 }
 
 }  // namespace chrome