Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1753)

Unified Diff: chrome/browser/prerender/prerender_resource_throttle_unittest.cc

Issue 2484633004: Change Lo-Fi bool to bitmask to support multiple Previews types (Closed)
Patch Set: fix ContentResourceProviderTest Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_resource_throttle_unittest.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
index 35479f39ce5225e874f3f22c85d2891b2cf07f1e..e9b5872d6c63fb458e28470037201177abd91b5a 100644
--- a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
@@ -18,6 +18,7 @@
#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"
@@ -212,17 +213,12 @@ TEST_F(PrerenderResourceThrottleTest, RedirectResume) {
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
+ request.get(), content::RESOURCE_TYPE_IMAGE, NULL, kDefaultChildId,
+ kDefaultRouteId, MSG_ROUTING_NONE,
+ /*is_main_frame=*/false,
+ /*parent_is_main_frame=*/false,
+ /*allow_download=*/true,
+ /*is_async=*/true, content::PREVIEWS_OFF);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(request.get());
@@ -255,17 +251,12 @@ TEST_F(PrerenderResourceThrottleTest, RedirectMainFrame) {
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
+ request.get(), content::RESOURCE_TYPE_MAIN_FRAME, NULL, kDefaultChildId,
+ kDefaultRouteId, MSG_ROUTING_NONE,
+ /*is_main_frame=*/true,
+ /*parent_is_main_frame=*/false,
+ /*allow_download=*/true,
+ /*is_async=*/true, content::PREVIEWS_OFF);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(request.get());
@@ -296,17 +287,12 @@ TEST_F(PrerenderResourceThrottleTest, RedirectSyncXHR) {
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
+ request.get(), content::RESOURCE_TYPE_XHR, NULL, kDefaultChildId,
+ kDefaultRouteId, MSG_ROUTING_NONE,
+ /*is_main_frame=*/false,
+ /*parent_is_main_frame=*/false,
+ /*allow_download=*/true,
+ /*is_async=*/false, content::PREVIEWS_OFF);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(request.get());

Powered by Google App Engine
This is Rietveld 408576698