Revert of gpu: GPU service scheduler.

content/test/layouttest_support.cc

 // Copyright (c) 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 "content/public/test/layouttest_support.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/test_compositor_frame_sink.h"
 #include "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/child/request_extra_data.h"
-#include "content/common/gpu_stream_constants.h"
 #include "content/common/renderer.mojom.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/screen_info.h"
 #include "content/public/renderer/renderer_gamepad_provider.h"
 #include "content/renderer/fetchers/manifest_fetcher.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/history_entry.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/input/render_widget_input_handler_delegate.h"
 #include "content/renderer/layout_test_dependencies.h"
@@ skipping 351 matching lines @@
     attributes.stencil_size = 0;
     attributes.samples = 0;
     attributes.sample_buffers = 0;
     attributes.bind_generates_resource = false;
     attributes.lose_context_when_out_of_memory = true;
     const bool automatic_flushes = false;
     const bool support_locking = false;
 
     auto context_provider =
         make_scoped_refptr(new ui::ContextProviderCommandBuffer(
-            gpu_channel_, kGpuStreamIdDefault, kGpuStreamPriorityDefault,
-            gpu::kNullSurfaceHandle,
+            gpu_channel_, gpu::GPU_STREAM_DEFAULT,
+            gpu::GpuStreamPriority::NORMAL, gpu::kNullSurfaceHandle,
             GURL("chrome://gpu/"
                  "LayoutTestDependenciesImpl::CreateOutputSurface"),
             automatic_flushes, support_locking, gpu::SharedMemoryLimits(),
             attributes, nullptr,
             ui::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING));
     context_provider->BindToCurrentThread();
 
     bool flipped_output_surface = false;
     return base::MakeUnique<cc::PixelTestOutputSurface>(
         std::move(context_provider), flipped_output_surface);
@@ skipping 192 matching lines @@
   }
 }
 
 bool IsNavigationInitiatedByRenderer(const blink::WebURLRequest& request) {
   RequestExtraData* extra_data =
       static_cast<RequestExtraData*>(request.GetExtraData());
   return extra_data && extra_data->navigation_initiated_by_renderer();
 }
 
 }  // namespace content