A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

cc/resource_provider_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/resource_provider.h"
 
 #include "base/logging.h"
 #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;
 using namespace WebKit;
 
 namespace {
 
 size_t textureSize(const gfx::Size& size, WGC3Denum format)
 {
     unsigned int componentsPerPixel = 4;
@@ skipping 264 matching lines @@
     }
 
     void expectNumResources(int count)
     {
         EXPECT_EQ(count, static_cast<int>(m_resourceProvider->numResources()));
         if (GetParam() == ResourceProvider::GLTexture)
             EXPECT_EQ(count, context()->textureCount());
     }
 
 protected:
+    DebugScopedSetImplThread implThread;
     scoped_ptr<ContextSharedData> m_sharedData;
     scoped_ptr<GraphicsContext> m_context;
     scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
 TEST_P(ResourceProviderTest, Basic)
 {
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
     int pool = 1;
@@ skipping 272 matching lines @@
     }
     EXPECT_EQ(0u, childResourceProvider->numResources());
 }
 
 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ResourceProviderTest,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
 } // namespace