Reland "Merge of CrossSiteResourceHandler and NavigationResourceThrottle."

content/browser/frame_host/navigation_handle_impl_unittest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/common/request_context_type.h"
 #include "content/test/test_render_frame_host.h"
@@ skipping 125 matching lines @@
   // it has not been called before.
   void SimulateWillProcessResponse() {
     was_callback_called_ = false;
     callback_result_ = NavigationThrottle::DEFER;
 
     // It's safe to use base::Unretained since the NavigationHandle is owned by
     // the NavigationHandleImplTest.
     test_handle_->WillProcessResponse(
         main_test_rfh(),
         scoped_refptr<net::HttpResponseHeaders>(), SSLStatus(),
+        GlobalRequestID(), false, false, false, base::Closure(),
         base::Bind(&NavigationHandleImplTest::UpdateThrottleCheckResult,
                    base::Unretained(this)));
   }
 
   // Returns the handle used in tests.
   NavigationHandleImpl* test_handle() const { return test_handle_.get(); }
 
   // Whether the callback was called.
   bool was_callback_called() const { return was_callback_called_; }
 
@@ skipping 506 matching lines @@
   EXPECT_EQ(NavigationThrottle::CANCEL_AND_IGNORE, callback_result());
   EXPECT_EQ(0, cancel_throttle->will_start_calls());
   EXPECT_EQ(0, cancel_throttle->will_redirect_calls());
   EXPECT_EQ(1, cancel_throttle->will_process_response_calls());
   EXPECT_EQ(0, proceed_throttle->will_start_calls());
   EXPECT_EQ(0, proceed_throttle->will_redirect_calls());
   EXPECT_EQ(0, proceed_throttle->will_process_response_calls());
 }
 
 }  // namespace content