Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/public/test/navigation_simulator.cc

 // Copyright 2017 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 "content/public/test/navigation_simulator.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/common/frame_messages.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/test/test_navigation_url_loader.h"
 #include "content/test/test_render_frame_host.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/redirect_info.h"
 
 namespace content {
 
 namespace {
 
 class NavigationThrottleCallbackRunner : public NavigationThrottle {
@@ skipping 112 matching lines @@
       return;
     DCHECK_EQ(handle_, request->navigation_handle());
   } else {
     render_frame_host_->OnMessageReceived(
         FrameHostMsg_DidStartLoading(render_frame_host_->GetRoutingID(), true));
     render_frame_host_->OnMessageReceived(FrameHostMsg_DidStartProvisionalLoad(
         render_frame_host_->GetRoutingID(), navigation_url_,
         std::vector<GURL>(), base::TimeTicks::Now()));
     DCHECK_EQ(handle_, render_frame_host_->navigation_handle());
     handle_->WillStartRequest(
-        "GET", scoped_refptr<content::ResourceRequestBodyImpl>(), referrer_,
+        "GET", scoped_refptr<content::ResourceRequestBody>(), referrer_,
         true /* user_gesture */, transition_, false /* is_external_protocol */,
         REQUEST_CONTEXT_TYPE_LOCATION,
         blink::WebMixedContentContextType::kNotMixedContent,
         base::Callback<void(NavigationThrottle::ThrottleCheckResult)>());
   }
 
   CHECK(handle_);
   WaitForThrottleChecksComplete();
 
   CHECK_EQ(1, num_did_start_navigation_called_);
@@ skipping 480 matching lines @@
   if (!should_result_in_error_page) {
     render_frame_host_->OnMessageReceived(
         FrameHostMsg_DidStopLoading(render_frame_host_->GetRoutingID()));
     CHECK_EQ(1, num_did_finish_navigation_called_);
   } else {
     CHECK_EQ(0, num_did_finish_navigation_called_);
   }
 }
 
 }  // namespace content