X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchrome_browser_field_trials_desktop.cc;h=ce629119a7b31507217e9f567461a860c204d32b;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=e79ff1f384f957bed39c28e3f85b1fd265fe7f33;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/chrome_browser_field_trials_desktop.cc b/src/chrome/browser/chrome_browser_field_trials_desktop.cc index e79ff1f..ce62911 100644 --- a/src/chrome/browser/chrome_browser_field_trials_desktop.cc +++ b/src/chrome/browser/chrome_browser_field_trials_desktop.cc @@ -13,7 +13,6 @@ #include "base/strings/string_util.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/google/google_brand.h" -#include "chrome/browser/omnibox/omnibox_field_trial.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" @@ -28,10 +27,6 @@ #include "net/spdy/spdy_session.h" #include "ui/base/layout.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" -#endif - namespace chrome { namespace { @@ -118,11 +113,9 @@ void SetupPreReadFieldTrial() { } // 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);