Change Lo-Fi bool to bitmask to support multiple Previews types

chrome/browser/prerender/prerender_resource_throttle_unittest.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 <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/resource_throttle.h"
+#include "content/public/common/previews_state.h"
 #include "content/public/test/test_browser_thread.h"
 #include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ skipping 180 matching lines @@
   std::unique_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
       net::DEFAULT_PRIORITY, &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_IMAGE,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
-      false,  // is_main_frame
-      false,  // parent_is_main_frame
-      true,   // allow_download
-      true,   // is_async
-      false); // is_using_lofi
+      false,                  // is_main_frame
+      false,                  // parent_is_main_frame
+      true,                   // allow_download
+      true,                   // is_async
+      content::PREVIEWS_OFF); // previews_state

[Nico, 2017/01/09 22:35:03]

ditto

[megjablon, 2017/01/10 22:30:01]

Done.

 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request->Start();
   delegate.Run();
   EXPECT_TRUE(delegate.was_deferred());
   // This calls WillRedirectRequestOnUI().
@@ skipping 18 matching lines @@
   std::unique_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
       net::DEFAULT_PRIORITY, &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
-      true,   // is_main_frame
-      false,  // parent_is_main_frame
-      true,   // allow_download
-      true,   // is_async
-      false); // is_using_lofi
+      true,                   // is_main_frame
+      false,                  // parent_is_main_frame
+      true,                   // allow_download
+      true,                   // is_async
+      content::PREVIEWS_OFF); // previews_state
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect. This time, it should
   // not be deferred.
   request->Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
@@ skipping 16 matching lines @@
   std::unique_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
       net::DEFAULT_PRIORITY, &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_XHR,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
-      false,   // is_main_frame
-      false,   // parent_is_main_frame
-      true,    // allow_download
-      false,   // is_async
-      false);  // is_using_lofi
+      false,                  // is_main_frame
+      false,                  // parent_is_main_frame
+      true,                   // allow_download
+      false,                  // is_async
+      content::PREVIEWS_OFF); // previews_state
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request->Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
   RunEvents();
 
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT,
             test_contents()->final_status());
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender