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

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

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/web/WorkerPermissionClient.h ('k') | Source/web/tests/FakeWebPlugin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "web/WebLocalFrameImpl.h" 11 #include "web/WebLocalFrameImpl.h"
12 #include "wtf/Forward.h" 12 #include "wtf/Forward.h"
13 #include "wtf/text/Base64.h" 13 #include "wtf/text/Base64.h"
14 #include <gtest/gtest.h> 14 #include <gtest/gtest.h>
15 #include <v8.h> 15 #include <v8.h>
16 16
17 namespace { 17 namespace {
18 18
19 using blink::FrameTestHelpers::WebViewHelper; 19 using blink::FrameTestHelpers::WebViewHelper;
20 using blink::FrameTestHelpers::pumpPendingRequestsDoNotUse; 20 using blink::FrameTestHelpers::pumpPendingRequestsDoNotUse;
21 using namespace blink; 21 using namespace blink;
22 22
23 class TestActivityLogger : public V8DOMActivityLogger { 23 class TestActivityLogger : public V8DOMActivityLogger {
24 public: 24 public:
25 virtual ~TestActivityLogger() { } 25 virtual ~TestActivityLogger() { }
26 26
27 void logGetter(const String& apiName) OVERRIDE 27 void logGetter(const String& apiName) override
28 { 28 {
29 m_loggedActivities.append(apiName); 29 m_loggedActivities.append(apiName);
30 } 30 }
31 31
32 void logSetter(const String& apiName, const v8::Handle<v8::Value>& newValue) OVERRIDE 32 void logSetter(const String& apiName, const v8::Handle<v8::Value>& newValue) override
33 { 33 {
34 m_loggedActivities.append(apiName + " | " + toCoreStringWithUndefinedOrN ullCheck(newValue)); 34 m_loggedActivities.append(apiName + " | " + toCoreStringWithUndefinedOrN ullCheck(newValue));
35 } 35 }
36 36
37 void logMethod(const String& apiName, int argc, const v8::Handle<v8::Value>* argv) OVERRIDE 37 void logMethod(const String& apiName, int argc, const v8::Handle<v8::Value>* argv) override
38 { 38 {
39 String activityString = apiName; 39 String activityString = apiName;
40 for (int i = 0; i < argc; i++) 40 for (int i = 0; i < argc; i++)
41 activityString = activityString + " | " + toCoreStringWithUndefinedO rNullCheck(argv[i]); 41 activityString = activityString + " | " + toCoreStringWithUndefinedO rNullCheck(argv[i]);
42 m_loggedActivities.append(activityString); 42 m_loggedActivities.append(activityString);
43 } 43 }
44 44
45 void logEvent(const String& eventName, int argc, const String* argv) OVERRID E 45 void logEvent(const String& eventName, int argc, const String* argv) overrid e
46 { 46 {
47 String activityString = eventName; 47 String activityString = eventName;
48 for (int i = 0; i < argc; i++) { 48 for (int i = 0; i < argc; i++) {
49 activityString = activityString + " | " + argv[i]; 49 activityString = activityString + " | " + argv[i];
50 } 50 }
51 m_loggedActivities.append(activityString); 51 m_loggedActivities.append(activityString);
52 } 52 }
53 53
54 void clear() { m_loggedActivities.clear(); } 54 void clear() { m_loggedActivities.clear(); }
55 bool verifyActivities(const Vector<String>& activities) const { return m_log gedActivities == activities; } 55 bool verifyActivities(const Vector<String>& activities) const { return m_log gedActivities == activities; }
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" 483 "blinkAddElement | script | data:text/html;charset=utf-8,D\n"
484 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" 484 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n"
485 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ; 485 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ;
486 executeScriptInMainWorld(code); 486 executeScriptInMainWorld(code);
487 ASSERT_TRUE(verifyActivities("")); 487 ASSERT_TRUE(verifyActivities(""));
488 executeScriptInIsolatedWorld(code); 488 executeScriptInIsolatedWorld(code);
489 ASSERT_TRUE(verifyActivities(expectedActivities)); 489 ASSERT_TRUE(verifyActivities(expectedActivities));
490 } 490 }
491 491
492 } // namespace 492 } // namespace
OLDNEW
« no previous file with comments | « Source/web/WorkerPermissionClient.h ('k') | Source/web/tests/FakeWebPlugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698