Allow prerendering of search results from Omnibox.

BUG=109680
TEST=


Review URL: http://codereview.chromium.org/9152021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117101 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 13 deletions

diff --git a/chrome/browser/autocomplete/network_action_predictor.cc b/chrome/browser/autocomplete/network_action_predictor.cc
index 848feeb..ce4dfb3 100644
--- a/chrome/browser/autocomplete/network_action_predictor.cc
+++ b/chrome/browser/autocomplete/network_action_predictor.cc
@@ -149,13 +149,8 @@ NetworkActionPredictor::Action NetworkActionPredictor::RecommendAction(
 
   // Downgrade prerender to preconnect if this is a search match or if omnibox
   // prerendering is disabled.
-  if (action == ACTION_PRERENDER &&
-      ((match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
-       match.type == AutocompleteMatch::SEARCH_SUGGEST ||
-       match.type == AutocompleteMatch::SEARCH_OTHER_ENGINE) ||
-       !prerender::IsOmniboxEnabled(profile_))) {
+  if (action == ACTION_PRERENDER && !prerender::IsOmniboxEnabled(profile_))
     action = ACTION_PRECONNECT;
-  }
 
   return action;
 }
diff --git a/chrome/browser/autocomplete/network_action_predictor_unittest.cc b/chrome/browser/autocomplete/network_action_predictor_unittest.cc
index fca1251..afe1480c 100644
--- a/chrome/browser/autocomplete/network_action_predictor_unittest.cc
+++ b/chrome/browser/autocomplete/network_action_predictor_unittest.cc
@@ -352,13 +352,7 @@ TEST_F(NetworkActionPredictorTest, RecommendActionSearch) {
 
   for (size_t i = 0; i < arraysize(test_url_db); ++i) {
     match.destination_url = GURL(test_url_db[i].url);
-    const NetworkActionPredictor::Action expected =
-        (test_url_db[i].expected_action ==
-         NetworkActionPredictor::ACTION_PRERENDER) ?
-            NetworkActionPredictor::ACTION_PRECONNECT :
-            test_url_db[i].expected_action;
-
-    EXPECT_EQ(expected,
+    EXPECT_EQ(test_url_db[i].expected_action,
               predictor()->RecommendAction(test_url_db[i].user_text, match))
         << "Unexpected action for " << match.destination_url;
   }