Revert of cc: Move worker context BindToCurrentThread/SetupLock calls out of cc::OutputSurface. (patchset #5 id:80001 of https://codereview.chromium.org/1317743002/ )

Reason for revert:
Likely causes crash on Mac: https://build.chromium.org/p/chromium.gpu/builders/Mac%20Release%20%28Intel%29/builds/54667

Going to see if reverting helps.
BUG=527186

Original issue's description:
> cc: Move worker context BindToCurrentThread/SetupLock calls out of cc::OutputSurface.
>
> This moves the responsibility to call these functions from
> cc:OutputSurface to the code that creates the context.
>
> BUG=523411
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/10b73d7c140bc67ddeeaf716eb31df0977fe2497
> Cr-Commit-Position: refs/heads/master@{#346712}

TBR=avi@chromium.org,danakj@chromium.org,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=523411

Review URL: https://codereview.chromium.org/1317533003

Cr-Commit-Position: refs/heads/master@{#346736}

1 files changed, 9 insertions, 9 deletions

diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h
index 628eaec..0f5f35f 100644
--- a/ui/compositor/test/in_process_context_provider.h
+++ b/ui/compositor/test/in_process_context_provider.h
@@ -38,6 +38,15 @@ class InProcessContextProvider : public cc::ContextProvider {
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       gpu::ImageFactory* image_factory);
 
+ private:
+  InProcessContextProvider(
+      const gpu::gles2::ContextCreationAttribHelper& attribs,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      gpu::ImageFactory* image_factory,
+      gfx::AcceleratedWidget window,
+      const std::string& debug_name);
+  ~InProcessContextProvider() override;
+
   // cc::ContextProvider:
   bool BindToCurrentThread() override;
   void DetachFromThread() override;
@@ -57,15 +66,6 @@ class InProcessContextProvider : public cc::ContextProvider {
       const MemoryPolicyChangedCallback& memory_policy_changed_callback)
       override;
 
- private:
-  InProcessContextProvider(
-      const gpu::gles2::ContextCreationAttribHelper& attribs,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      gpu::ImageFactory* image_factory,
-      gfx::AcceleratedWidget window,
-      const std::string& debug_name);
-  ~InProcessContextProvider() override;
-
   void OnLostContext();
 
   base::ThreadChecker main_thread_checker_;