Remove GPU relinquish resources infrastructure and stop GPU process.

content/browser/gpu/gpu_process_host.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/browser/gpu/gpu_process_host.h"
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 379 matching lines @@
 }
 
 GpuProcessHost::GpuProcessHost(int host_id, GpuProcessKind kind)
     : host_id_(host_id),
       valid_(true),
       in_process_(false),
       swiftshader_rendering_(false),
       kind_(kind),
       process_launched_(false),
       initialized_(false),
+      expecting_shutdown_(false),
       gpu_crash_recorded_(false),
       uma_memory_stats_received_(false) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess) ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kInProcessGPU)) {
     in_process_ = true;
   }
 
   // If the 'single GPU process' policy ever changes, we still want to maintain
@@ skipping 13 matching lines @@
       base::Bind(base::IgnoreResult(&GpuProcessHostUIShim::Create), host_id));
 
   process_.reset(new BrowserChildProcessHostImpl(PROCESS_TYPE_GPU, this));
 }
 
 GpuProcessHost::~GpuProcessHost() {
   DCHECK(CalledOnValidThread());
 
   SendOutstandingReplies();
 
-  RecordProcessCrash();
+  // Do not record crash if GPU process was asked to stop and stopped
+  // successfully.
+  int exit_code;
+  if (!expecting_shutdown_ ||
+      process_->GetTerminationStatus(false, &exit_code) !=
+          base::TERMINATION_STATUS_NORMAL_TERMINATION) {
+    RecordProcessCrash();

[no sievers, 2015/07/28 21:28:50]

That's better, but calling RecordProcessCrash() here at all seems odd.
Can you just remove it?

Then I think it needs a fix for Android in
BrowserChildProcessHostImpl::OnChildDisconnected():

Similarly to CrOS TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM, can you add
TERMINATION_STATUS_OOM_PROTECTED to make sure it calls OnProcessCrashed()?

And then I'd also add an explicit call to RecordProcessCrash() from
GpuProcessHost::Get() where Init() failed and we 'delete host'.
But put a TODO to revisit this behavior. It's not really a crash, but we also
don't want to regress anything in terms of fallback-to-sw behavior.

You can also get rid of |expecting_shutdown_| then.

[no sievers, 2015/07/28 21:31:46]

I forgot one:

You might also want to override OnProcessLaunchFailed() to keep the current
behavior. But it's also a bit questionable to count it as a crash.

[derekjchow1, 2015/07/29 18:35:40]

Done.
Done.
Done. I've stapled your name to the TODO. Is that ok?
Done.
Done.

+  }
 
   // In case we never started, clean up.
   while (!queued_messages_.empty()) {
     delete queued_messages_.front();
     queued_messages_.pop();
   }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   if (!io_surface_manager_token_.IsZero()) {
     BrowserIOSurfaceManager::GetInstance()->InvalidateGpuProcessToken();
@@ skipping 452 matching lines @@
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   if (!io_surface_manager_token_.IsZero()) {
     BrowserIOSurfaceManager::GetInstance()->InvalidateGpuProcessToken();
     io_surface_manager_token_.SetZero();
   }
 #endif
 
   process_->ForceShutdown();
 }
 
+void GpuProcessHost::StopGpuProcess() {
+  Send(new GpuMsg_Finalize());
+  expecting_shutdown_ = true;
+}
+
 void GpuProcessHost::BeginFrameSubscription(
     int surface_id,
     base::WeakPtr<RenderWidgetHostViewFrameSubscriber> subscriber) {
   frame_subscribers_[surface_id] = subscriber;
 }
 
 void GpuProcessHost::EndFrameSubscription(int surface_id) {
   frame_subscribers_.erase(surface_id);
 }
 
@@ skipping 223 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
 }
 
 }  // namespace content