Add is_main_frame and parent_is_main_frame to ResourceRequestInfo::AllocateForTesting.

chrome/browser/prerender/prerender_tracker_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/message_loop/message_loop.h"
@@ skipping 208 matching lines @@
   RunEvents();
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       NULL));
-  content::ResourceRequestInfo::AllocateForTesting(request.get(),
-                                                   content::RESOURCE_TYPE_IMAGE,
-                                                   NULL,
-                                                   kDefaultChildId,
-                                                   kDefaultRouteId,
-                                                   MSG_ROUTING_NONE,
-                                                   true);
+  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);  // is_async
 
   // 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 23 matching lines @@
       net::DEFAULT_PRIORITY,
       &delegate,
       NULL));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
-      true);
+      true,   // is_main_frame
+      false,  // parent_is_main_frame
+      true);  // is_async
 
   // 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 14 matching lines @@
   RunEvents();
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       NULL));
-  content::ResourceRequestInfo::AllocateForTesting(request.get(),
-                                                   content::RESOURCE_TYPE_XHR,
-                                                   NULL,
-                                                   kDefaultChildId,
-                                                   kDefaultRouteId,
-                                                   MSG_ROUTING_NONE,
-                                                   false);
+  content::ResourceRequestInfo::AllocateForTesting(
+      request.get(),
+      content::RESOURCE_TYPE_XHR,
+      NULL,
+      kDefaultChildId,
+      kDefaultRouteId,
+      MSG_ROUTING_NONE,
+      false,   // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
 
   // 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