diff options
author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-03 01:57:10 +0000 |
---|---|---|
committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-03 01:57:10 +0000 |
commit | 2a4b6ea20ed5149573920e215268d05de4b07ad8 (patch) | |
tree | a21a59045819f77cb34752e51988f75f3ca6bec6 /content/child/resource_dispatcher_unittest.cc | |
parent | 4b16eba1296046a04271526695643d1b3f158586 (diff) | |
download | chromium_src-2a4b6ea20ed5149573920e215268d05de4b07ad8.zip chromium_src-2a4b6ea20ed5149573920e215268d05de4b07ad8.tar.gz chromium_src-2a4b6ea20ed5149573920e215268d05de4b07ad8.tar.bz2 |
Revert of Remove webkit's ResourceLoaderBridge interface. (https://codereview.chromium.org/226273005/)
Reason for revert:
Looks like it broke LSan bots:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%282%29/builds/2229
TBR=jam
NOTREECHECKS=true
NOTRY=true
Original issue's description:
> Remove webkit's ResourceLoaderBridge interface.
>
> ResourceLoaderBridge was originally created to bridge code in //webkit that
> talked to WebURLLoaderImpl (which talked to Blink) with code in
> ResourceDispatcher in content which used IPC. Now that WebURLLoaderImpl
> is in content/child, we don't need this interface anymore.
>
> As requested by John in -
> https://codereview.chromium.org/186193005/diff/1/content/public/child/resource_loader_bridge.h#newcode42
>
> BUG=265753,338338,237249
> TEST=content_unittests
> R=jam@chromium.org
> TBR=darin
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267947
Review URL: https://codereview.chromium.org/267973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/resource_dispatcher_unittest.cc')
-rw-r--r-- | content/child/resource_dispatcher_unittest.cc | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc index 2781387..b12db6b 100644 --- a/content/child/resource_dispatcher_unittest.cc +++ b/content/child/resource_dispatcher_unittest.cc @@ -19,8 +19,10 @@ #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/child/resource_loader_bridge.h" #include "webkit/common/appcache/appcache_interfaces.h" +using webkit_glue::ResourceLoaderBridge; using webkit_glue::ResourceResponseInfo; namespace content { @@ -162,37 +164,37 @@ class ResourceDispatcherTest : public testing::Test, public IPC::Sender { dispatcher_.reset(); } - RequestInfo* CreateRequestInfo(RequestExtraData* extra_data) { - RequestInfo* request_info = new RequestInfo(); - request_info->method = "GET"; - request_info->url = GURL(test_page_url); - request_info->first_party_for_cookies = GURL(test_page_url); - request_info->referrer = GURL(); - request_info->headers = std::string(); - request_info->load_flags = 0; - request_info->requestor_pid = 0; - request_info->request_type = ResourceType::SUB_RESOURCE; - request_info->appcache_host_id = appcache::kNoHostId; - request_info->routing_id = 0; - request_info->extra_data = extra_data; + ResourceLoaderBridge* CreateBridge() { + RequestInfo request_info; + request_info.method = "GET"; + request_info.url = GURL(test_page_url); + request_info.first_party_for_cookies = GURL(test_page_url); + request_info.referrer = GURL(); + request_info.headers = std::string(); + request_info.load_flags = 0; + request_info.requestor_pid = 0; + request_info.request_type = ResourceType::SUB_RESOURCE; + request_info.appcache_host_id = appcache::kNoHostId; + request_info.routing_id = 0; + RequestExtraData extra_data; + request_info.extra_data = &extra_data; - return request_info; + return dispatcher_->CreateBridge(request_info); } std::vector<IPC::Message> message_queue_; static scoped_ptr<ResourceDispatcher> dispatcher_; }; -// static +/*static*/ scoped_ptr<ResourceDispatcher> ResourceDispatcherTest::dispatcher_; // Does a simple request and tests that the correct data is received. TEST_F(ResourceDispatcherTest, RoundTrip) { - RequestExtraData extra_data; - scoped_ptr<RequestInfo> request_info(CreateRequestInfo(&extra_data)); TestRequestCallback callback; + ResourceLoaderBridge* bridge = CreateBridge(); - dispatcher_->StartAsync(*request_info.get(), NULL, &callback); + bridge->Start(&callback); ProcessMessages(); @@ -201,6 +203,8 @@ TEST_F(ResourceDispatcherTest, RoundTrip) { //EXPECT_TRUE(callback.complete()); //EXPECT_STREQ(test_page_contents, callback.data().c_str()); //EXPECT_EQ(test_page_contents_len, callback.total_encoded_data_length()); + + delete bridge; } // Tests that the request IDs are straight when there are multiple requests. @@ -325,13 +329,14 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest, TEST_F(DeferredResourceLoadingTest, DeferredLoadTest) { base::MessageLoopForIO message_loop; - RequestExtraData extra_data; - scoped_ptr<RequestInfo> request_info(CreateRequestInfo(&extra_data)); - dispatcher_->StartAsync(*request_info.get(), NULL, this); + ResourceLoaderBridge* bridge = CreateBridge(); + + bridge->Start(this); InitMessages(); // Dispatch deferred messages. message_loop.RunUntilIdle(); + delete bridge; } class TimeConversionTest : public ResourceDispatcherTest, @@ -343,9 +348,8 @@ class TimeConversionTest : public ResourceDispatcherTest, } void PerformTest(const ResourceResponseHead& response_head) { - RequestExtraData extra_data; - scoped_ptr<RequestInfo> request_info(CreateRequestInfo(&extra_data)); - dispatcher_->StartAsync(*request_info.get(), NULL, this); + scoped_ptr<ResourceLoaderBridge> bridge(CreateBridge()); + bridge->Start(this); dispatcher_->OnMessageReceived( ResourceMsg_ReceivedResponse(0, response_head)); |