summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 02:22:41 +0000
committertburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 02:22:41 +0000
commit5020a62a16053b5d14396c2a521097b8acc12f1a (patch)
tree692a20dc5f75eca64866a6c364303c337d4923fb
parent9e98f61b07269b80b58cea6ff962a80d14cb5f92 (diff)
downloadchromium_src-5020a62a16053b5d14396c2a521097b8acc12f1a.zip
chromium_src-5020a62a16053b5d14396c2a521097b8acc12f1a.tar.gz
chromium_src-5020a62a16053b5d14396c2a521097b8acc12f1a.tar.bz2
temporarily disable omnibox prerendering for m25
R=cbentzel BUG=180077 Review URL: https://codereview.chromium.org/12387108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186060 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/predictors/autocomplete_action_predictor_unittest.cc2
-rw-r--r--chrome/browser/prerender/prerender_field_trial.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
index ae4ff2a..3135d48 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
@@ -348,7 +348,7 @@ TEST_F(AutocompleteActionPredictorTest, DeleteOldIdsFromCaches) {
}
}
-TEST_F(AutocompleteActionPredictorTest, RecommendActionURL) {
+TEST_F(AutocompleteActionPredictorTest, DISABLED_RecommendActionURL) {
ASSERT_NO_FATAL_FAILURE(AddAllRows());
AutocompleteMatch match;
diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc
index 6ff8c6a..3fee083 100644
--- a/chrome/browser/prerender/prerender_field_trial.cc
+++ b/chrome/browser/prerender/prerender_field_trial.cc
@@ -218,6 +218,8 @@ void ConfigureOmniboxPrerender() {
}
bool IsOmniboxEnabled(Profile* profile) {
+ return false;
+
if (!profile)
return false;