Revert 75393 - Cancel prerender if any of the visited URLs are https....

chrome/browser/prerender/prerender_resource_handler_unittest.cc

 // Copyright (c) 2011 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_resource_handler.h"
 #include "chrome/common/resource_response.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 151 matching lines @@
 }
 
 // Tests that a valid HTML resource will correctly get diverted
 // to the PrerenderManager.
 TEST_F(PrerenderResourceHandlerTest, Prerender) {
   StartPrerendering("text/html",
                     "HTTP/1.1 200 OK\n");
   EXPECT_EQ(default_url_, last_handled_url_);
 }
 
-static const int kRequestId = 1;
-
 // Tests that the final request in a redirect chain will
 // get diverted to the PrerenderManager.
 TEST_F(PrerenderResourceHandlerTest, PrerenderRedirect) {
+  int request_id = 1;
   GURL url_redirect("http://www.redirect.com");
   bool defer = false;
-  EXPECT_TRUE(pre_handler_->OnWillStart(kRequestId, default_url_, &defer));
+  EXPECT_TRUE(pre_handler_->OnWillStart(request_id, default_url_, &defer));
   EXPECT_FALSE(defer);
-  EXPECT_TRUE(pre_handler_->OnRequestRedirected(kRequestId,
+  EXPECT_TRUE(pre_handler_->OnRequestRedirected(request_id,
                                                 url_redirect,
                                                 NULL,
                                                 &defer));
   EXPECT_FALSE(defer);
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   response->response_head.mime_type = "text/html";
   response->response_head.headers = CreateResponseHeaders(
       "HTTP/1.1 200 OK\n");
-  EXPECT_TRUE(pre_handler_->OnResponseStarted(kRequestId, response));
+  EXPECT_TRUE(pre_handler_->OnResponseStarted(request_id, response));
   EXPECT_TRUE(last_handled_url_.is_empty());
   loop_.RunAllPending();
   EXPECT_EQ(url_redirect, last_handled_url_);
   EXPECT_EQ(true, ContainsAliasURL(url_redirect));
   EXPECT_EQ(true, ContainsAliasURL(default_url_));
   EXPECT_EQ(2, static_cast<int>(alias_urls_.size()));
 }
 
-// Tests that https requests will not be prerendered.
-TEST_F(PrerenderResourceHandlerTest, PrerenderHttps) {
-  GURL url_https("https://www.google.com");
-  bool defer = false;
-  EXPECT_FALSE(pre_handler_->OnWillStart(kRequestId, url_https, &defer));
-  EXPECT_FALSE(defer);
-}
-
-TEST_F(PrerenderResourceHandlerTest, PrerenderRedirectToHttps) {
-  bool defer = false;
-  EXPECT_TRUE(pre_handler_->OnWillStart(kRequestId, default_url_, &defer));
-  EXPECT_FALSE(defer);
-  GURL url_https("https://www.google.com");
-  EXPECT_FALSE(pre_handler_->OnRequestRedirected(kRequestId,
-                                                 url_https,
-                                                 NULL,
-                                                 &defer));
-  EXPECT_FALSE(defer);
-}
-
 }  // namespace
 
 }  // namespace prerender