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

cc/thread_proxy.h

 // Copyright 2011 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_THREAD_PROXY_H_
 #define CC_THREAD_PROXY_H_
 
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/completion_event.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/proxy.h"
 #include "cc/resource_update_controller.h"
 #include "cc/scheduler.h"
 
 namespace cc {
 
 class InputHandler;
 class LayerTreeHost;
 class ResourceUpdateQueue;
 class Scheduler;
 class ScopedThreadProxy;
 class Thread;
 
 class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient {
 public:
-    static scoped_ptr<Proxy> create(LayerTreeHost*, scoped_ptr<Thread> implThread);
+    static scoped_ptr<Proxy> create(LayerTreeHost*);
 
     virtual ~ThreadProxy();
 
     // Proxy implementation
     virtual bool compositeAndReadback(void *pixels, const gfx::Rect&) OVERRIDE;
     virtual void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration) OVERRIDE;
     virtual void finishAllRendering() OVERRIDE;
     virtual bool isStarted() const OVERRIDE;
     virtual bool initializeContext() OVERRIDE;
     virtual void setSurfaceReady() OVERRIDE;
@@ skipping 32 matching lines @@
     virtual ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced() OVERRIDE;
     virtual void scheduledActionCommit() OVERRIDE;
     virtual void scheduledActionBeginContextRecreation() OVERRIDE;
     virtual void scheduledActionAcquireLayerTexturesForMainThread() OVERRIDE;
     virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE;
 
     // ResourceUpdateControllerClient implementation
     virtual void readyToFinalizeTextureUpdates() OVERRIDE;
 
 private:
-    ThreadProxy(LayerTreeHost*, scoped_ptr<Thread> implThread);
+    explicit ThreadProxy(LayerTreeHost*);
 
     // Set on impl thread, read on main thread.
     struct BeginFrameAndCommitState {
         BeginFrameAndCommitState();
         ~BeginFrameAndCommitState();
 
         base::TimeTicks monotonicFrameBeginTime;
         scoped_ptr<ScrollAndScaleSet> scrollInfo;
         WebKit::WebTransformationMatrix implTransform;
         PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
@@ skipping 83 matching lines @@
     base::TimeDelta m_totalCommitTime;
     size_t m_totalCommitCount;
 
     bool m_deferCommits;
     bool m_deferredCommitPending;
 };
 
 }  // namespace cc
 
 #endif  // CC_THREAD_PROXY_H_