| 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/V8Binding.h" | 7 #include "bindings/core/v8/V8Binding.h" |
| 8 #include "bindings/core/v8/V8DOMActivityLogger.h" | 8 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 9 #include "public/web/WebCache.h" | 9 #include "public/web/WebCache.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 Vector<String> m_loggedActivities; | 65 Vector<String> m_loggedActivities; |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 class ActivityLoggerTest : public testing::Test { | 68 class ActivityLoggerTest : public testing::Test { |
| 69 protected: | 69 protected: |
| 70 ActivityLoggerTest() | 70 ActivityLoggerTest() |
| 71 { | 71 { |
| 72 m_activityLogger = new TestActivityLogger(); | 72 m_activityLogger = new TestActivityLogger(); |
| 73 V8DOMActivityLogger::setActivityLogger(isolatedWorldId, String(), wrapUn
ique(m_activityLogger)); | 73 V8DOMActivityLogger::setActivityLogger(isolatedWorldId, String(), wrapUn
ique(m_activityLogger)); |
| 74 m_webViewHelper.initialize(true); | 74 m_webViewHelper.initialize(true); |
| 75 m_scriptController = &m_webViewHelper.webViewImpl()->mainFrameImpl()->fr
ame()->script(); | 75 m_scriptController = &m_webViewHelper.webView()->mainFrameImpl()->frame(
)->script(); |
| 76 FrameTestHelpers::loadFrame(m_webViewHelper.webViewImpl()->mainFrame(),
"about:blank"); | 76 FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), "abo
ut:blank"); |
| 77 } | 77 } |
| 78 | 78 |
| 79 ~ActivityLoggerTest() | 79 ~ActivityLoggerTest() |
| 80 { | 80 { |
| 81 WebCache::clear(); | 81 WebCache::clear(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void executeScriptInMainWorld(const String& script) const | 84 void executeScriptInMainWorld(const String& script) const |
| 85 { | 85 { |
| 86 v8::HandleScope scope(v8::Isolate::GetCurrent()); | 86 v8::HandleScope scope(v8::Isolate::GetCurrent()); |
| 87 m_scriptController->executeScriptInMainWorld(script); | 87 m_scriptController->executeScriptInMainWorld(script); |
| 88 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webViewImpl()->mainFra
me()); | 88 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame()
); |
| 89 } | 89 } |
| 90 | 90 |
| 91 void executeScriptInIsolatedWorld(const String& script) const | 91 void executeScriptInIsolatedWorld(const String& script) const |
| 92 { | 92 { |
| 93 v8::HandleScope scope(v8::Isolate::GetCurrent()); | 93 v8::HandleScope scope(v8::Isolate::GetCurrent()); |
| 94 HeapVector<ScriptSourceCode> sources; | 94 HeapVector<ScriptSourceCode> sources; |
| 95 sources.append(ScriptSourceCode(script)); | 95 sources.append(ScriptSourceCode(script)); |
| 96 Vector<v8::Local<v8::Value>> results; | 96 Vector<v8::Local<v8::Value>> results; |
| 97 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, source
s, extensionGroup, 0); | 97 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, source
s, extensionGroup, 0); |
| 98 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webViewImpl()->mainFra
me()); | 98 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame()
); |
| 99 } | 99 } |
| 100 | 100 |
| 101 bool verifyActivities(const String& activities) | 101 bool verifyActivities(const String& activities) |
| 102 { | 102 { |
| 103 Vector<String> activityVector; | 103 Vector<String> activityVector; |
| 104 activities.split("\n", activityVector); | 104 activities.split("\n", activityVector); |
| 105 return m_activityLogger->verifyActivities(activityVector); | 105 return m_activityLogger->verifyActivities(activityVector); |
| 106 } | 106 } |
| 107 | 107 |
| 108 private: | 108 private: |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" | 530 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" |
| 531 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" | 531 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" |
| 532 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E"
; | 532 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E"
; |
| 533 executeScriptInMainWorld(code); | 533 executeScriptInMainWorld(code); |
| 534 ASSERT_TRUE(verifyActivities("")); | 534 ASSERT_TRUE(verifyActivities("")); |
| 535 executeScriptInIsolatedWorld(code); | 535 executeScriptInIsolatedWorld(code); |
| 536 ASSERT_TRUE(verifyActivities(expectedActivities)); | 536 ASSERT_TRUE(verifyActivities(expectedActivities)); |
| 537 } | 537 } |
| 538 | 538 |
| 539 } // namespace blink | 539 } // namespace blink |
| OLD | NEW |