Split GpuProcessHost into GpuProcessHostUIShim, which runs on the UI...

chrome/browser/io_thread.cc

 // Copyright (c) 2010 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 "chrome/browser/io_thread.h"
 #include "base/command_line.h"
 #include "base/leak_tracker.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/passive_log_collector.h"
 #include "chrome/browser/net/url_fetcher.h"
 #include "chrome/common/chrome_switches.h"
 #include "net/base/mapped_host_resolver.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_impl.h"
 #include "net/base/net_util.h"
@@ skipping 141 matching lines @@
     globals_->host_resolver->RemoveObserver(prefetch_observer_);
     delete prefetch_observer_;
     prefetch_observer_ = NULL;
   }
 
   // TODO(eroman): hack for http://crbug.com/15513
   if (globals_->host_resolver->GetAsHostResolverImpl()) {
     globals_->host_resolver.get()->GetAsHostResolverImpl()->Shutdown();
   }
 
+  GpuProcessHost::Shutdown();
+
   delete globals_;
   globals_ = NULL;
 
   // URLFetcher and URLRequest instances must NOT outlive the IO thread.
   //
   // Strictly speaking, URLFetcher's CheckForLeaks() should be done on the
   // UI thread. However, since there _shouldn't_ be any instances left
   // at this point, it shouldn't be a race.
   //
   // We check URLFetcher first, since if it has leaked then an associated
@@ skipping 72 matching lines @@
     net::HostCache* host_cache =
         globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
     if (host_cache)
       host_cache->clear();
   }
   // Clear all of the passively logged data.
   // TODO(eroman): this is a bit heavy handed, really all we need to do is
   //               clear the data pertaining to off the record context.
   globals_->net_log->passive_collector()->Clear();
 }