Revert of cc: Use worker context for one-copy tile initialization. (patchset #20 id:380001 of https://codereview.chromium.org/1230203007/ )

Reason for revert:
Suspected of colliding with another patch and causing Issue 517719.

Original issue's description:
> cc: Use worker context for one-copy tile initialization.
>
> This moves management of staging resources to
> OneCopyTileTaskWorkerPool class. This makes it possible
> to use a worker context to issue and detect when copy
> operations complete.
>
> BUG=490295
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/d5157ac5afec145b85746b42f2d86383483a8222
> Cr-Commit-Position: refs/heads/master@{#342235}

TBR=piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=490295,517719

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

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

4 files changed, 8 insertions, 8 deletions

diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 586bfad..7e80854 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -101,10 +101,13 @@ void Display::InitializeRenderer() {
   if (resource_provider_)
     return;
 
+  // Display does not use GpuMemoryBuffers, so persistent map is not relevant.
+  bool use_persistent_map_for_gpu_memory_buffers = false;
   scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
       output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
       nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures,
-      settings_.texture_id_allocation_chunk_size);
+      settings_.texture_id_allocation_chunk_size,
+      use_persistent_map_for_gpu_memory_buffers);
   if (!resource_provider)
     return;
 
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc
index 6a2779d..e21d15d 100644
--- a/cc/surfaces/surface_display_output_surface.cc
+++ b/cc/surfaces/surface_display_output_surface.cc
@@ -17,9 +17,8 @@ namespace cc {
 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
     SurfaceManager* surface_manager,
     SurfaceIdAllocator* allocator,
-    const scoped_refptr<ContextProvider>& context_provider,
-    const scoped_refptr<ContextProvider>& worker_context_provider)
-    : OutputSurface(context_provider, worker_context_provider),
+    const scoped_refptr<ContextProvider>& context_provider)
+    : OutputSurface(context_provider),
       display_client_(NULL),
       factory_(surface_manager, this),
       allocator_(allocator) {
diff --git a/cc/surfaces/surface_display_output_surface.h b/cc/surfaces/surface_display_output_surface.h
index 2cdaadc..c11bb86 100644
--- a/cc/surfaces/surface_display_output_surface.h
+++ b/cc/surfaces/surface_display_output_surface.h
@@ -27,8 +27,7 @@ class CC_SURFACES_EXPORT SurfaceDisplayOutputSurface
   SurfaceDisplayOutputSurface(
       SurfaceManager* surface_manager,
       SurfaceIdAllocator* allocator,
-      const scoped_refptr<ContextProvider>& context_provider,
-      const scoped_refptr<ContextProvider>& worker_context_provider);
+      const scoped_refptr<ContextProvider>& context_provider);
   ~SurfaceDisplayOutputSurface() override;
 
   void set_display_client(OnscreenDisplayClient* display_client) {
diff --git a/cc/surfaces/surface_display_output_surface_unittest.cc b/cc/surfaces/surface_display_output_surface_unittest.cc
index 3145729..9b67f1f 100644
--- a/cc/surfaces/surface_display_output_surface_unittest.cc
+++ b/cc/surfaces/surface_display_output_surface_unittest.cc
@@ -60,8 +60,7 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
         context_provider_(TestContextProvider::Create()),
         surface_display_output_surface_(&surface_manager_,
                                         &allocator_,
-                                        context_provider_,
-                                        nullptr) {
+                                        context_provider_) {
     output_surface_ = display_client_.output_surface();
     display_client_.set_surface_output_surface(
         &surface_display_output_surface_);