| OLD | NEW |
| 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 #include <tuple> | 7 #include <tuple> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1928 RequestExtraData* extra_data = NULL; | 1928 RequestExtraData* extra_data = NULL; |
| 1929 | 1929 |
| 1930 // Make sure each new document has a new provider and | 1930 // Make sure each new document has a new provider and |
| 1931 // that the main request is tagged with the provider's id. | 1931 // that the main request is tagged with the provider's id. |
| 1932 LoadHTML("<b>A Document</b>"); | 1932 LoadHTML("<b>A Document</b>"); |
| 1933 ASSERT_TRUE(GetMainFrame()->dataSource()); | 1933 ASSERT_TRUE(GetMainFrame()->dataSource()); |
| 1934 provider = ServiceWorkerNetworkProvider::FromDocumentState( | 1934 provider = ServiceWorkerNetworkProvider::FromDocumentState( |
| 1935 DocumentState::FromDataSource(GetMainFrame()->dataSource())); | 1935 DocumentState::FromDataSource(GetMainFrame()->dataSource())); |
| 1936 ASSERT_TRUE(provider); | 1936 ASSERT_TRUE(provider); |
| 1937 extra_data = static_cast<RequestExtraData*>( | 1937 extra_data = static_cast<RequestExtraData*>( |
| 1938 GetMainFrame()->dataSource()->request().getExtraData()); | 1938 GetMainFrame()->dataSource()->getRequest().getExtraData()); |
| 1939 ASSERT_TRUE(extra_data); | 1939 ASSERT_TRUE(extra_data); |
| 1940 EXPECT_EQ(extra_data->service_worker_provider_id(), | 1940 EXPECT_EQ(extra_data->service_worker_provider_id(), |
| 1941 provider->provider_id()); | 1941 provider->provider_id()); |
| 1942 int provider1_id = provider->provider_id(); | 1942 int provider1_id = provider->provider_id(); |
| 1943 | 1943 |
| 1944 LoadHTML("<b>New Document B Goes Here</b>"); | 1944 LoadHTML("<b>New Document B Goes Here</b>"); |
| 1945 ASSERT_TRUE(GetMainFrame()->dataSource()); | 1945 ASSERT_TRUE(GetMainFrame()->dataSource()); |
| 1946 provider = ServiceWorkerNetworkProvider::FromDocumentState( | 1946 provider = ServiceWorkerNetworkProvider::FromDocumentState( |
| 1947 DocumentState::FromDataSource(GetMainFrame()->dataSource())); | 1947 DocumentState::FromDataSource(GetMainFrame()->dataSource())); |
| 1948 ASSERT_TRUE(provider); | 1948 ASSERT_TRUE(provider); |
| 1949 EXPECT_NE(provider1_id, provider->provider_id()); | 1949 EXPECT_NE(provider1_id, provider->provider_id()); |
| 1950 extra_data = static_cast<RequestExtraData*>( | 1950 extra_data = static_cast<RequestExtraData*>( |
| 1951 GetMainFrame()->dataSource()->request().getExtraData()); | 1951 GetMainFrame()->dataSource()->getRequest().getExtraData()); |
| 1952 ASSERT_TRUE(extra_data); | 1952 ASSERT_TRUE(extra_data); |
| 1953 EXPECT_EQ(extra_data->service_worker_provider_id(), | 1953 EXPECT_EQ(extra_data->service_worker_provider_id(), |
| 1954 provider->provider_id()); | 1954 provider->provider_id()); |
| 1955 | 1955 |
| 1956 // See that subresource requests are also tagged with the provider's id. | 1956 // See that subresource requests are also tagged with the provider's id. |
| 1957 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame())); | 1957 EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame())); |
| 1958 blink::WebURLRequest request(GURL("http://foo.com")); | 1958 blink::WebURLRequest request(GURL("http://foo.com")); |
| 1959 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource); | 1959 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource); |
| 1960 blink::WebURLResponse redirect_response; | 1960 blink::WebURLResponse redirect_response; |
| 1961 frame()->willSendRequest(GetMainFrame(), request); | 1961 frame()->willSendRequest(GetMainFrame(), request); |
| (...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2551 ExpectPauseAndResume(3); | 2551 ExpectPauseAndResume(3); |
| 2552 blink::WebScriptSource source2( | 2552 blink::WebScriptSource source2( |
| 2553 WebString::fromUTF8("function func2() { func1(); }; func2();")); | 2553 WebString::fromUTF8("function func2() { func1(); }; func2();")); |
| 2554 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); | 2554 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); |
| 2555 | 2555 |
| 2556 EXPECT_FALSE(IsPaused()); | 2556 EXPECT_FALSE(IsPaused()); |
| 2557 Detach(); | 2557 Detach(); |
| 2558 } | 2558 } |
| 2559 | 2559 |
| 2560 } // namespace content | 2560 } // namespace content |
| OLD | NEW |