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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after
2056 RequestExtraData* extra_data = NULL; 2056 RequestExtraData* extra_data = NULL;
2057 2057
2058 // Make sure each new document has a new provider and 2058 // Make sure each new document has a new provider and
2059 // that the main request is tagged with the provider's id. 2059 // that the main request is tagged with the provider's id.
2060 LoadHTML("<b>A Document</b>"); 2060 LoadHTML("<b>A Document</b>");
2061 ASSERT_TRUE(GetMainFrame()->dataSource()); 2061 ASSERT_TRUE(GetMainFrame()->dataSource());
2062 provider = ServiceWorkerNetworkProvider::FromDocumentState( 2062 provider = ServiceWorkerNetworkProvider::FromDocumentState(
2063 DocumentState::FromDataSource(GetMainFrame()->dataSource())); 2063 DocumentState::FromDataSource(GetMainFrame()->dataSource()));
2064 ASSERT_TRUE(provider); 2064 ASSERT_TRUE(provider);
2065 extra_data = static_cast<RequestExtraData*>( 2065 extra_data = static_cast<RequestExtraData*>(
2066 GetMainFrame()->dataSource()->request().extraData()); 2066 GetMainFrame()->dataSource()->request().getExtraData());
2067 ASSERT_TRUE(extra_data); 2067 ASSERT_TRUE(extra_data);
2068 EXPECT_EQ(extra_data->service_worker_provider_id(), 2068 EXPECT_EQ(extra_data->service_worker_provider_id(),
2069 provider->provider_id()); 2069 provider->provider_id());
2070 int provider1_id = provider->provider_id(); 2070 int provider1_id = provider->provider_id();
2071 2071
2072 LoadHTML("<b>New Document B Goes Here</b>"); 2072 LoadHTML("<b>New Document B Goes Here</b>");
2073 ASSERT_TRUE(GetMainFrame()->dataSource()); 2073 ASSERT_TRUE(GetMainFrame()->dataSource());
2074 provider = ServiceWorkerNetworkProvider::FromDocumentState( 2074 provider = ServiceWorkerNetworkProvider::FromDocumentState(
2075 DocumentState::FromDataSource(GetMainFrame()->dataSource())); 2075 DocumentState::FromDataSource(GetMainFrame()->dataSource()));
2076 ASSERT_TRUE(provider); 2076 ASSERT_TRUE(provider);
2077 EXPECT_NE(provider1_id, provider->provider_id()); 2077 EXPECT_NE(provider1_id, provider->provider_id());
2078 extra_data = static_cast<RequestExtraData*>( 2078 extra_data = static_cast<RequestExtraData*>(
2079 GetMainFrame()->dataSource()->request().extraData()); 2079 GetMainFrame()->dataSource()->request().getExtraData());
2080 ASSERT_TRUE(extra_data); 2080 ASSERT_TRUE(extra_data);
2081 EXPECT_EQ(extra_data->service_worker_provider_id(), 2081 EXPECT_EQ(extra_data->service_worker_provider_id(),
2082 provider->provider_id()); 2082 provider->provider_id());
2083 2083
2084 // See that subresource requests are also tagged with the provider's id. 2084 // See that subresource requests are also tagged with the provider's id.
2085 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame())); 2085 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame()));
2086 blink::WebURLRequest request(GURL("http://foo.com")); 2086 blink::WebURLRequest request(GURL("http://foo.com"));
2087 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource); 2087 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
2088 blink::WebURLResponse redirect_response; 2088 blink::WebURLResponse redirect_response;
2089 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response); 2089 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
2090 extra_data = static_cast<RequestExtraData*>(request.extraData()); 2090 extra_data = static_cast<RequestExtraData*>(request.getExtraData());
2091 ASSERT_TRUE(extra_data); 2091 ASSERT_TRUE(extra_data);
2092 EXPECT_EQ(extra_data->service_worker_provider_id(), 2092 EXPECT_EQ(extra_data->service_worker_provider_id(),
2093 provider->provider_id()); 2093 provider->provider_id());
2094 } 2094 }
2095 2095
2096 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) { 2096 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
2097 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode()); 2097 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2098 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility()); 2098 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2099 2099
2100 frame()->SetAccessibilityMode(AccessibilityModeTreeOnly); 2100 frame()->SetAccessibilityMode(AccessibilityModeTreeOnly);
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
2475 FROM_HERE, 2475 FROM_HERE,
2476 base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this))); 2476 base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
2477 ExecuteJavaScriptForTests("debugger;"); 2477 ExecuteJavaScriptForTests("debugger;");
2478 2478
2479 // CloseWhilePaused should resume execution and continue here. 2479 // CloseWhilePaused should resume execution and continue here.
2480 EXPECT_FALSE(IsPaused()); 2480 EXPECT_FALSE(IsPaused());
2481 Detach(); 2481 Detach();
2482 } 2482 }
2483 2483
2484 } // namespace content 2484 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/service_worker/service_worker_context_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698