Move test-only stuff from cc/debug/ to cc/test

cc/test/test_context_provider.h

 // Copyright 2013 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.
 
-#ifndef CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
-#define CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
+#ifndef CC_TEST_TEST_CONTEXT_PROVIDER_H_
+#define CC_TEST_TEST_CONTEXT_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "cc/base/cc_export.h"
-#include "cc/debug/test_context_support.h"
 #include "cc/output/context_provider.h"
+#include "cc/test/test_context_support.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
 
 namespace cc {
 class TestWebGraphicsContext3D;
 
-class CC_EXPORT TestContextProvider
-    : public NON_EXPORTED_BASE(cc::ContextProvider) {
+class TestContextProvider : public cc::ContextProvider {
  public:
   typedef base::Callback<scoped_ptr<TestWebGraphicsContext3D>(void)>
     CreateCallback;
 
   static scoped_refptr<TestContextProvider> Create();
   static scoped_refptr<TestContextProvider> Create(
       scoped_ptr<TestWebGraphicsContext3D> context);
 
   virtual bool BindToCurrentThread() OVERRIDE;
   virtual Capabilities ContextCapabilities() OVERRIDE;
@@ skipping 15 matching lines @@
   // state on the test context before binding. Don't call
   // makeContextCurrent on the context returned from this method.
   TestWebGraphicsContext3D* UnboundTestContext3d();
 
   void SetMemoryAllocation(const ManagedMemoryPolicy& policy,
                            bool discard_backbuffer_when_not_visible);
 
   void SetMaxTransferBufferUsageBytes(size_t max_transfer_buffer_usage_bytes);
 
  protected:
-  TestContextProvider(scoped_ptr<TestWebGraphicsContext3D> context);
+  explicit TestContextProvider(scoped_ptr<TestWebGraphicsContext3D> context);
   virtual ~TestContextProvider();
 
   void OnLostContext();
   void OnSwapBuffersComplete();
 
   TestContextSupport support_;
 
   scoped_ptr<TestWebGraphicsContext3D> context3d_;
   bool bound_;
 
@@ skipping 10 matching lines @@
   class LostContextCallbackProxy;
   scoped_ptr<LostContextCallbackProxy> lost_context_callback_proxy_;
 
   class SwapBuffersCompleteCallbackProxy;
   scoped_ptr<SwapBuffersCompleteCallbackProxy>
       swap_buffers_complete_callback_proxy_;
 };
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
+#endif  // CC_TEST_TEST_CONTEXT_PROVIDER_H_