summaryrefslogtreecommitdiffstats
path: root/cc/resource_provider_unittest.cc
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-04 03:25:55 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-04 03:25:55 +0000
commitdb79992121c7627abc0855e655d91470ee3ac3ac (patch)
treec9e8cc8541c775dbe600fb299b56fb37b9e05227 /cc/resource_provider_unittest.cc
parent8311a2b8ceea50b6bcd923cd709949cc082b865d (diff)
downloadchromium_src-db79992121c7627abc0855e655d91470ee3ac3ac.zip
chromium_src-db79992121c7627abc0855e655d91470ee3ac3ac.tar.gz
chromium_src-db79992121c7627abc0855e655d91470ee3ac3ac.tar.bz2
Remove static thread pointers from CC, attempt 2
BUG=152904 Review URL: https://chromiumcodereview.appspot.com/11232051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider_unittest.cc')
-rw-r--r--cc/resource_provider_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 2aca348..6465bc8 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -10,12 +10,12 @@
#include "cc/graphics_context.h"
#include "cc/scoped_ptr_deque.h"
#include "cc/scoped_ptr_hash_map.h"
-#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "cc/test/fake_web_compositor_output_surface.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
+#include "ui/gfx/rect.h"
#include <public/WebGraphicsContext3D.h>
using namespace cc;
@@ -300,7 +300,6 @@ public:
}
protected:
- DebugScopedSetImplThread implThread;
scoped_ptr<ContextSharedData> m_sharedData;
scoped_ptr<GraphicsContext> m_context;
scoped_ptr<ResourceProvider> m_resourceProvider;