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

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

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 4 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
« no previous file with comments | « content/renderer/pepper/host_var_tracker.cc ('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 "webkit/plugins/ppapi/ppapi_unittest.h" 5 #include "content/renderer/pepper/ppapi_unittest.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "content/renderer/pepper/host_globals.h"
9 #include "content/renderer/pepper/host_var_tracker.h"
10 #include "content/renderer/pepper/mock_plugin_delegate.h"
11 #include "content/renderer/pepper/mock_resource.h"
12 #include "content/renderer/pepper/npapi_glue.h"
13 #include "content/renderer/pepper/npobject_var.h"
14 #include "content/renderer/pepper/ppapi_plugin_instance_impl.h"
8 #include "ppapi/c/pp_var.h" 15 #include "ppapi/c/pp_var.h"
9 #include "ppapi/c/ppp_instance.h" 16 #include "ppapi/c/ppp_instance.h"
10 #include "third_party/npapi/bindings/npruntime.h" 17 #include "third_party/npapi/bindings/npruntime.h"
11 #include "third_party/WebKit/public/web/WebBindings.h" 18 #include "third_party/WebKit/public/web/WebBindings.h"
12 #include "webkit/plugins/ppapi/host_globals.h"
13 #include "webkit/plugins/ppapi/host_var_tracker.h"
14 #include "webkit/plugins/ppapi/mock_plugin_delegate.h"
15 #include "webkit/plugins/ppapi/mock_resource.h"
16 #include "webkit/plugins/ppapi/npapi_glue.h"
17 #include "webkit/plugins/ppapi/npobject_var.h"
18 #include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
19 19
20 using ppapi::NPObjectVar; 20 using ppapi::NPObjectVar;
21 21
22 namespace webkit { 22 namespace webkit {
23 namespace ppapi { 23 namespace ppapi {
24 24
25 namespace { 25 namespace {
26 26
27 // Tracked NPObjects ----------------------------------------------------------- 27 // Tracked NPObjects -----------------------------------------------------------
28 28
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 // Releasing the resource should free the internal ref, and so making a new 130 // Releasing the resource should free the internal ref, and so making a new
131 // one now should generate a new ID. 131 // one now should generate a new ID.
132 PP_Var pp_object3 = NPObjectToPPVarForTest(instance(), npobject.get()); 132 PP_Var pp_object3 = NPObjectToPPVarForTest(instance(), npobject.get());
133 EXPECT_NE(pp_object1.value.as_id, pp_object3.value.as_id); 133 EXPECT_NE(pp_object1.value.as_id, pp_object3.value.as_id);
134 var_tracker->ReleaseVar(static_cast<int32_t>(pp_object3.value.as_id)); 134 var_tracker->ReleaseVar(static_cast<int32_t>(pp_object3.value.as_id));
135 } 135 }
136 136
137 } // namespace ppapi 137 } // namespace ppapi
138 } // namespace webkit 138 } // namespace webkit
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_var_tracker.cc ('k') | content/renderer/pepper/message_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698