Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/browser/security_exploit_browsertest.cc

 // Copyright (c) 2013 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/appcache_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/file_chooser_params.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test_utils_internal.h"
 #include "content/test/test_content_browser_client.h"
 #include "ipc/ipc_security_test_util.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ skipping 537 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir.GetPath(), &file_path));
   ASSERT_LT(
       0, base::WriteFile(file_path, file_content.data(), file_content.size()));
 
   // Simulate an IPC message asking to POST a file that the renderer shouldn't
   // have access to.
   FrameHostMsg_OpenURL_Params params;
   params.url = target_url;
   params.uses_post = true;
-  params.resource_request_body = new ResourceRequestBodyImpl;
+  params.resource_request_body = new ResourceRequestBody;
   params.resource_request_body->AppendFileRange(
       file_path, 0, file_content.size(), base::Time());
   params.disposition = WindowOpenDisposition::CURRENT_TAB;
   params.should_replace_current_entry = true;
   params.user_gesture = true;
   params.is_history_navigation_in_new_child = false;
 
   FrameHostMsg_OpenURL msg(root->current_frame_host()->routing_id(), params);
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       root->current_frame_host()->GetProcess()->GetChannel(), msg);
 
   // Verify that the malicious navigation did not commit the navigation to
   // |target_url|.
   WaitForLoadStop(shell()->web_contents());
   EXPECT_EQ(start_url, root->current_frame_host()->GetLastCommittedURL());
 
   // Verify that the malicious renderer got killed.
   exit_observer.Wait();
   EXPECT_FALSE(exit_observer.did_exit_normally());
 }
 
 }  // namespace content