| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "FrameTestHelpers.h" | 7 #include "FrameTestHelpers.h" |
| 8 #include "bindings/core/v8/ScriptController.h" | 8 #include "bindings/core/v8/ScriptController.h" |
| 9 #include "bindings/core/v8/V8DOMActivityLogger.h" | 9 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 10 #include "web/WebLocalFrameImpl.h" | 10 #include "web/WebLocalFrameImpl.h" |
| 11 #include "wtf/Forward.h" | 11 #include "wtf/Forward.h" |
| 12 #include "wtf/text/Base64.h" | 12 #include "wtf/text/Base64.h" |
| 13 #include <gtest/gtest.h> | 13 #include <gtest/gtest.h> |
| 14 #include <v8.h> | 14 #include <v8.h> |
| 15 | 15 |
| 16 using WebCore::ScriptController; | 16 using blink::ScriptController; |
| 17 using WebCore::ScriptSourceCode; | 17 using blink::ScriptSourceCode; |
| 18 using WebCore::V8DOMActivityLogger; | 18 using blink::V8DOMActivityLogger; |
| 19 using WebCore::toCoreStringWithUndefinedOrNullCheck; | 19 using blink::toCoreStringWithUndefinedOrNullCheck; |
| 20 using blink::FrameTestHelpers::WebViewHelper; | 20 using blink::FrameTestHelpers::WebViewHelper; |
| 21 using blink::FrameTestHelpers::pumpPendingRequestsDoNotUse; | 21 using blink::FrameTestHelpers::pumpPendingRequestsDoNotUse; |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 class TestActivityLogger : public V8DOMActivityLogger { | 25 class TestActivityLogger : public V8DOMActivityLogger { |
| 26 public: | 26 public: |
| 27 virtual ~TestActivityLogger() { } | 27 virtual ~TestActivityLogger() { } |
| 28 | 28 |
| 29 void logGetter(const String& apiName) OVERRIDE | 29 void logGetter(const String& apiName) OVERRIDE |
| (...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" | 490 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" |
| 491 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" | 491 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" |
| 492 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E"
; | 492 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E"
; |
| 493 executeScriptInMainWorld(code); | 493 executeScriptInMainWorld(code); |
| 494 ASSERT_TRUE(verifyActivities("")); | 494 ASSERT_TRUE(verifyActivities("")); |
| 495 executeScriptInIsolatedWorld(code); | 495 executeScriptInIsolatedWorld(code); |
| 496 ASSERT_TRUE(verifyActivities(expectedActivities)); | 496 ASSERT_TRUE(verifyActivities(expectedActivities)); |
| 497 } | 497 } |
| 498 | 498 |
| 499 } // namespace | 499 } // namespace |
| OLD | NEW |