Merge 186060

chrome/browser/prerender/prerender_field_trial.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/prerender/prerender_field_trial.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 200 matching lines @@
   }
   scoped_refptr<FieldTrial> omnibox_prerender_trial(
       FieldTrialList::FactoryGetFieldTrial(
           kOmniboxTrialName, kDivisor, "OmniboxPrerenderEnabled",
           2012, 12, 30, &g_omnibox_trial_default_group_number));
   omnibox_prerender_trial->AppendGroup("OmniboxPrerenderDisabled",
                                        kDisabledProbability);
 }
 
 bool IsOmniboxEnabled(Profile* profile) {
+  return false;
+
   if (!profile)
     return false;
 
   if (!PrerenderManager::IsPrerenderingPossible())
     return false;
 
   // Override any field trial groups if the user has set a command line flag.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kPrerenderFromOmnibox)) {
     const std::string switch_value =
@@ skipping 13 matching lines @@
   return group == FieldTrial::kNotFinalized ||
          group == g_omnibox_trial_default_group_number;
 }
 
 bool IsLocalPredictorEnabled() {
   return base::FieldTrialList::FindFullName(kLocalPredictorTrialName) ==
       kLocalPredictorEnabledGroup;
 }
 
 }  // namespace prerender