diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:44:27 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:44:27 +0000 |
| commit | 5107bb375e729ca18da5fd56c45b5e5bda1b9612 (patch) | |
| tree | b0729be474ee1556d3eec71ccc87039dd20571c3 /webkit/plugins/ppapi/callbacks_unittest.cc | |
| parent | add6501064facc2b74704902d0a206fa36944723 (diff) | |
| download | chromium_src-5107bb375e729ca18da5fd56c45b5e5bda1b9612.zip chromium_src-5107bb375e729ca18da5fd56c45b5e5bda1b9612.tar.gz chromium_src-5107bb375e729ca18da5fd56c45b5e5bda1b9612.tar.bz2 | |
Rename the ResourceTracker in webkit to HostResourceTracker.
This fixes the confusion that comes from there being two:
webkit/plugins/ppapi/resource_tracker and
ppapi/shared_impl/resource_tracker.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/8320010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/callbacks_unittest.cc')
| -rw-r--r-- | webkit/plugins/ppapi/callbacks_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/plugins/ppapi/callbacks_unittest.cc b/webkit/plugins/ppapi/callbacks_unittest.cc index b11c725..8e90b31 100644 --- a/webkit/plugins/ppapi/callbacks_unittest.cc +++ b/webkit/plugins/ppapi/callbacks_unittest.cc @@ -8,13 +8,13 @@ #include "base/message_loop.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/shared_impl/resource_tracker.h" #include "webkit/plugins/ppapi/callbacks.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/mock_resource.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/resource_helper.h" -#include "webkit/plugins/ppapi/resource_tracker.h" namespace webkit { namespace ppapi { @@ -185,7 +185,7 @@ class CallbackResourceTest : public PpapiUnittest { // Test that callbacks get aborted on the last resource unref. TEST_F(CallbackResourceTest, AbortOnNoRef) { - ResourceTracker* resource_tracker = + HostResourceTracker* resource_tracker = HostGlobals::Get()->host_resource_tracker(); // Test several things: Unref-ing a resource (to zero refs) with callbacks @@ -225,7 +225,7 @@ TEST_F(CallbackResourceTest, AbortOnNoRef) { // Test that "resurrecting" a resource (getting a new ID for a |Resource|) // doesn't resurrect callbacks. TEST_F(CallbackResourceTest, Resurrection) { - ResourceTracker* resource_tracker = + HostResourceTracker* resource_tracker = HostGlobals::Get()->host_resource_tracker(); scoped_refptr<CallbackMockResource> resource( |