Remove last OOP-D references in code

There were a few remaining references to OOP-D in the code that are no
longer relevant since the feature is launched.

Bug: 936425
Change-Id: I32930a85684007068303d1b8083a3b4a00227e02
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2101189Reviewed-by: Jonathan Backer <backer@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750561}

chrome/browser/flag_descriptions.cc

@@ -1732,10 +1732,10 @@ const char kShowOverdrawFeedbackDescription[] =
     "Visualize overdraw by color-coding elements based on if they have other "
     "elements drawn underneath.";
 
-const char kSkiaRendererName[] = "Skia API for OOP-D compositing";
+const char kSkiaRendererName[] = "Skia API for compositing";
 const char kSkiaRendererDescription[] =
     "If enabled, the display compositor will use Skia as the graphics API "
-    "instead of OpenGL ES. Requires Viz Display Compositor (OOP-D).";
+    "instead of OpenGL ES.";
 
 const char kHistoryManipulationIntervention[] =
     "History Manipulation Intervention";

components/viz/service/frame_sinks/external_begin_frame_source_android.cc

@@ -27,9 +27,6 @@ void ExternalBeginFrameSourceAndroid::OnVSync(
     const base::android::JavaParamRef<jobject>& obj,
     jlong time_micros,
     jlong period_micros) {
-  // TODO(ericrk): This logic is ported from window_android.cc. Once OOP-D
-  // conversion is complete, we can delete the logic there.
-
   // Warning: It is generally unsafe to manufacture TimeTicks values. The
   // following assumption is being made, AND COULD EASILY BREAK AT ANY TIME:
   // Upstream, Java code is providing "System.nanos() / 1000," and this is the

components/viz/service/main/viz_main_impl.cc

@@ -262,19 +262,19 @@ scoped_refptr<gl::GLShareGroup> VizMainImpl::GetShareGroup() {
 void VizMainImpl::ExitProcess(bool immediately) {
   DCHECK(gpu_thread_task_runner_->BelongsToCurrentThread());
 
-  // Close mojom::VizMain bindings first so the browser can't try to reconnect.
-  receiver_.reset();
-
   if (!gpu_init_->gpu_info().in_process_gpu && immediately) {
     // Atomically shut down GPU process to make it faster and simpler.
     base::Process::TerminateCurrentProcessImmediately(/*exit_code=*/0);
     return;
   }
 
+  // Close mojom::VizMain bindings first so the browser can't try to reconnect.
+  receiver_.reset();
+
   if (viz_compositor_thread_runner_) {
-    // OOP-D requires destroying RootCompositorFrameSinkImpls on the compositor
-    // thread while the GPU thread is still running to avoid deadlock. Quit GPU
-    // thread TaskRunner after cleanup on compositor thread is finished.
+    // Destroy RootCompositorFrameSinkImpls on the compositor while the GPU
+    // thread is still running to avoid deadlock. Quit GPU thread TaskRunner
+    // after cleanup on compositor thread is finished.
     viz_compositor_thread_runner_->CleanupForShutdown(base::BindOnce(
         &Delegate::QuitMainMessageLoop, base::Unretained(delegate_)));
   } else {

components/viz/service/main/viz_main_impl.h

@@ -161,16 +161,16 @@ class VizMainImpl : public mojom::VizMain,
   std::unique_ptr<gpu::GpuInit> gpu_init_;
   std::unique_ptr<GpuServiceImpl> gpu_service_;
 
-  // This is created for OOP-D only. It allows the display compositor to use
-  // InProcessCommandBuffer to send GPU commands to the GPU thread from the
-  // compositor thread. This must outlive |viz_compositor_thread_runner_|.
+  // Allows the display compositor to use InProcessCommandBuffer to send GPU
+  // commands to the GPU thread from the compositor thread. This must outlive
+  // |viz_compositor_thread_runner_|.
   std::unique_ptr<gpu::CommandBufferTaskExecutor> task_executor_;
 
   // If the gpu service is not yet ready then we stash pending
   // FrameSinkManagerParams.
   mojom::FrameSinkManagerParamsPtr pending_frame_sink_manager_params_;
 
-  // Runs the VizCompositorThread for the display compositor with OOP-D.
+  // Runs the VizCompositorThread for the display compositor.
   std::unique_ptr<VizCompositorThreadRunnerImpl>
       viz_compositor_thread_runner_impl_;
   // Note under Android WebView where VizCompositorThreadRunner is not created

gpu/config/gpu_mode.h

@@ -18,9 +18,10 @@ enum class GpuMode {
   HARDWARE_VULKAN,
   // The GPU process is running for SwiftShader WebGL.
   SWIFTSHADER,
-  // The GPU process is running for the display compositor (OOP-D only).
+  // The GPU process is running for the display compositor.
   DISPLAY_COMPOSITOR,
-  // The GPU process is disabled and won't start (not OOP-D only).
+  // The GPU process is disabled and won't start. This is only used on Windows
+  // when GPU acceleration and SwiftShader are both disabled.
   DISABLED,
 };