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

Side by Side Diff: content/renderer/pepper/host_var_tracker_unittest.cc

Issue 670683003: Standardize usage of virtual/override/final in content/renderer/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 | « content/renderer/pepper/host_var_tracker.h ('k') | content/renderer/pepper/message_channel.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "content/renderer/pepper/host_globals.h" 7 #include "content/renderer/pepper/host_globals.h"
8 #include "content/renderer/pepper/host_var_tracker.h" 8 #include "content/renderer/pepper/host_var_tracker.h"
9 #include "content/renderer/pepper/mock_resource.h" 9 #include "content/renderer/pepper/mock_resource.h"
10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
(...skipping 18 matching lines...) Expand all
29 class MyObject : public gin::Wrappable<MyObject> { 29 class MyObject : public gin::Wrappable<MyObject> {
30 public: 30 public:
31 static gin::WrapperInfo kWrapperInfo; 31 static gin::WrapperInfo kWrapperInfo;
32 32
33 static v8::Handle<v8::Value> Create(v8::Isolate* isolate) { 33 static v8::Handle<v8::Value> Create(v8::Isolate* isolate) {
34 return gin::CreateHandle(isolate, new MyObject()).ToV8(); 34 return gin::CreateHandle(isolate, new MyObject()).ToV8();
35 } 35 }
36 36
37 private: 37 private:
38 MyObject() { ++g_v8objects_alive; } 38 MyObject() { ++g_v8objects_alive; }
39 virtual ~MyObject() { --g_v8objects_alive; } 39 ~MyObject() override { --g_v8objects_alive; }
40 40
41 DISALLOW_COPY_AND_ASSIGN(MyObject); 41 DISALLOW_COPY_AND_ASSIGN(MyObject);
42 }; 42 };
43 43
44 gin::WrapperInfo MyObject::kWrapperInfo = {gin::kEmbedderNativeGin}; 44 gin::WrapperInfo MyObject::kWrapperInfo = {gin::kEmbedderNativeGin};
45 45
46 class PepperTryCatchForTest : public PepperTryCatch { 46 class PepperTryCatchForTest : public PepperTryCatch {
47 public: 47 public:
48 PepperTryCatchForTest(PepperPluginInstanceImpl* instance, 48 PepperTryCatchForTest(PepperPluginInstanceImpl* instance,
49 V8VarConverter* converter) 49 V8VarConverter* converter)
50 : PepperTryCatch(instance, converter), 50 : PepperTryCatch(instance, converter),
51 handle_scope_(instance->GetIsolate()), 51 handle_scope_(instance->GetIsolate()),
52 context_scope_(v8::Context::New(instance->GetIsolate())) {} 52 context_scope_(v8::Context::New(instance->GetIsolate())) {}
53 53
54 virtual void SetException(const char* message) override { NOTREACHED(); } 54 void SetException(const char* message) override { NOTREACHED(); }
55 virtual bool HasException() override { return false; } 55 bool HasException() override { return false; }
56 virtual v8::Handle<v8::Context> GetContext() override { 56 v8::Handle<v8::Context> GetContext() override {
57 return instance_->GetIsolate()->GetCurrentContext(); 57 return instance_->GetIsolate()->GetCurrentContext();
58 } 58 }
59 59
60 private: 60 private:
61 v8::HandleScope handle_scope_; 61 v8::HandleScope handle_scope_;
62 v8::Context::Scope context_scope_; 62 v8::Context::Scope context_scope_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(PepperTryCatchForTest); 64 DISALLOW_COPY_AND_ASSIGN(PepperTryCatchForTest);
65 }; 65 };
66 66
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 pp_object1 = ppapi::ScopedPPVar(); 132 pp_object1 = ppapi::ScopedPPVar();
133 pp_object2 = ppapi::ScopedPPVar(); 133 pp_object2 = ppapi::ScopedPPVar();
134 134
135 // Releasing the resource should free the internal ref, and so making a new 135 // Releasing the resource should free the internal ref, and so making a new
136 // one now should generate a new ID. 136 // one now should generate a new ID.
137 ppapi::ScopedPPVar pp_object3 = try_catch.FromV8(v8_object); 137 ppapi::ScopedPPVar pp_object3 = try_catch.FromV8(v8_object);
138 EXPECT_NE(pp_object1.get().value.as_id, pp_object3.get().value.as_id); 138 EXPECT_NE(pp_object1.get().value.as_id, pp_object3.get().value.as_id);
139 } 139 }
140 140
141 } // namespace content 141 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_var_tracker.h ('k') | content/renderer/pepper/message_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698