OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "bindings/core/v8/ScriptController.h" | 5 #include "bindings/core/v8/ScriptController.h" |
6 #include "bindings/core/v8/ScriptSourceCode.h" | 6 #include "bindings/core/v8/ScriptSourceCode.h" |
7 #include "bindings/core/v8/V8BindingForCore.h" | 7 #include "bindings/core/v8/V8BindingForCore.h" |
8 #include "bindings/core/v8/V8DOMActivityLogger.h" | 8 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 9 #include "core/frame/WebLocalFrameBase.h" |
9 #include "platform/wtf/Forward.h" | 10 #include "platform/wtf/Forward.h" |
10 #include "platform/wtf/PtrUtil.h" | 11 #include "platform/wtf/PtrUtil.h" |
11 #include "platform/wtf/text/Base64.h" | 12 #include "platform/wtf/text/Base64.h" |
12 #include "public/platform/WebCache.h" | 13 #include "public/platform/WebCache.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
14 #include "v8/include/v8.h" | 15 #include "v8/include/v8.h" |
15 #include "web/WebLocalFrameImpl.h" | |
16 #include "web/tests/FrameTestHelpers.h" | 16 #include "web/tests/FrameTestHelpers.h" |
17 | 17 |
18 namespace blink { | 18 namespace blink { |
19 | 19 |
20 using blink::FrameTestHelpers::WebViewHelper; | 20 using blink::FrameTestHelpers::WebViewHelper; |
21 using blink::FrameTestHelpers::PumpPendingRequestsForFrameToLoad; | 21 using blink::FrameTestHelpers::PumpPendingRequestsForFrameToLoad; |
22 | 22 |
23 class TestActivityLogger : public V8DOMActivityLogger { | 23 class TestActivityLogger : public V8DOMActivityLogger { |
24 public: | 24 public: |
25 ~TestActivityLogger() override {} | 25 ~TestActivityLogger() override {} |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" | 587 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" |
588 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" | 588 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" |
589 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; | 589 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; |
590 ExecuteScriptInMainWorld(code); | 590 ExecuteScriptInMainWorld(code); |
591 ASSERT_TRUE(VerifyActivities("")); | 591 ASSERT_TRUE(VerifyActivities("")); |
592 ExecuteScriptInIsolatedWorld(code); | 592 ExecuteScriptInIsolatedWorld(code); |
593 ASSERT_TRUE(VerifyActivities(expected_activities)); | 593 ASSERT_TRUE(VerifyActivities(expected_activities)); |
594 } | 594 } |
595 | 595 |
596 } // namespace blink | 596 } // namespace blink |
OLD | NEW |