Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 392333004: Drop 'WebURLRequest::setTargetType' from various content/renderer files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pepper_url_loader_host Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/pepper/pepper_url_loader_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after
2317 EXPECT_NE(provider1_id, provider->provider_id()); 2317 EXPECT_NE(provider1_id, provider->provider_id());
2318 extra_data = static_cast<RequestExtraData*>( 2318 extra_data = static_cast<RequestExtraData*>(
2319 GetMainFrame()->dataSource()->request().extraData()); 2319 GetMainFrame()->dataSource()->request().extraData());
2320 ASSERT_TRUE(extra_data); 2320 ASSERT_TRUE(extra_data);
2321 EXPECT_EQ(extra_data->service_worker_provider_id(), 2321 EXPECT_EQ(extra_data->service_worker_provider_id(),
2322 provider->provider_id()); 2322 provider->provider_id());
2323 2323
2324 // See that subresource requests are also tagged with the provider's id. 2324 // See that subresource requests are also tagged with the provider's id.
2325 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame())); 2325 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame()));
2326 blink::WebURLRequest request(GURL("http://foo.com")); 2326 blink::WebURLRequest request(GURL("http://foo.com"));
2327 request.setTargetType(blink::WebURLRequest::TargetIsSubresource); 2327 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
2328 blink::WebURLResponse redirect_response; 2328 blink::WebURLResponse redirect_response;
2329 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response); 2329 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
2330 extra_data = static_cast<RequestExtraData*>(request.extraData()); 2330 extra_data = static_cast<RequestExtraData*>(request.extraData());
2331 ASSERT_TRUE(extra_data); 2331 ASSERT_TRUE(extra_data);
2332 EXPECT_EQ(extra_data->service_worker_provider_id(), 2332 EXPECT_EQ(extra_data->service_worker_provider_id(),
2333 provider->provider_id()); 2333 provider->provider_id());
2334 } 2334 }
2335 2335
2336 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) { 2336 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
2337 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode()); 2337 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode());
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
2430 ProcessPendingMessages(); 2430 ProcessPendingMessages();
2431 base::Time after_navigation = 2431 base::Time after_navigation =
2432 base::Time::Now() + base::TimeDelta::FromDays(1); 2432 base::Time::Now() + base::TimeDelta::FromDays(1);
2433 2433
2434 base::Time late_nav_reported_start = 2434 base::Time late_nav_reported_start =
2435 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2435 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
2436 EXPECT_LE(late_nav_reported_start, after_navigation); 2436 EXPECT_LE(late_nav_reported_start, after_navigation);
2437 } 2437 }
2438 2438
2439 } // namespace content 2439 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_url_loader_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698