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

Side by Side Diff: Source/web/tests/ActivityLoggerTest.cpp

Issue 843683005: Fix a bit of C++11 in web/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 | Annotate | Revision Log
OLDNEW
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/V8Binding.h" 9 #include "bindings/core/v8/V8Binding.h"
10 #include "bindings/core/v8/V8DOMActivityLogger.h" 10 #include "bindings/core/v8/V8DOMActivityLogger.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 v8::HandleScope scope(v8::Isolate::GetCurrent()); 73 v8::HandleScope scope(v8::Isolate::GetCurrent());
74 m_scriptController->executeScriptInMainWorld(script); 74 m_scriptController->executeScriptInMainWorld(script);
75 pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame()); 75 pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame());
76 } 76 }
77 77
78 void executeScriptInIsolatedWorld(const String& script) const 78 void executeScriptInIsolatedWorld(const String& script) const
79 { 79 {
80 v8::HandleScope scope(v8::Isolate::GetCurrent()); 80 v8::HandleScope scope(v8::Isolate::GetCurrent());
81 Vector<ScriptSourceCode> sources; 81 Vector<ScriptSourceCode> sources;
82 sources.append(ScriptSourceCode(script)); 82 sources.append(ScriptSourceCode(script));
83 Vector<v8::Local<v8::Value> > results; 83 Vector<v8::Local<v8::Value>> results;
84 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, source s, extensionGroup, 0); 84 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, source s, extensionGroup, 0);
85 pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame()); 85 pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame());
86 } 86 }
87 87
88 bool verifyActivities(const String& activities) 88 bool verifyActivities(const String& activities)
89 { 89 {
90 Vector<String> activityVector; 90 Vector<String> activityVector;
91 activities.split("\n", activityVector); 91 activities.split("\n", activityVector);
92 return m_activityLogger->verifyActivities(activityVector); 92 return m_activityLogger->verifyActivities(activityVector);
93 } 93 }
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" 517 "blinkAddElement | script | data:text/html;charset=utf-8,D\n"
518 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" 518 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n"
519 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ; 519 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ;
520 executeScriptInMainWorld(code); 520 executeScriptInMainWorld(code);
521 ASSERT_TRUE(verifyActivities("")); 521 ASSERT_TRUE(verifyActivities(""));
522 executeScriptInIsolatedWorld(code); 522 executeScriptInIsolatedWorld(code);
523 ASSERT_TRUE(verifyActivities(expectedActivities)); 523 ASSERT_TRUE(verifyActivities(expectedActivities));
524 } 524 }
525 525
526 } // namespace 526 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698