Relanding r172627

Can't reproduce the issue that's encountered by shawnsingh anymore.

Original CL text:

Cache GL strings from GPU process and use them at next browser startup.

So we can make complete GPU blacklist decisions at browser startup time.

BUG=164728
TEST=
TBR=kbr,shawnsingh
Review URL: https://codereview.chromium.org/11612008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173564 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index a458e4c..7bb57d0 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_tab_id_map.h"
 #include "chrome/browser/first_run/upgrade_util.h"
+#include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
@@ -473,6 +474,13 @@ IconManager* BrowserProcessImpl::icon_manager() {
   return icon_manager_.get();
 }
 
+GLStringManager* BrowserProcessImpl::gl_string_manager() {
+  DCHECK(CalledOnValidThread());
+  if (!gl_string_manager_.get())
+    gl_string_manager_.reset(new GLStringManager());
+  return gl_string_manager_.get();
+}
+
 RenderWidgetSnapshotTaker* BrowserProcessImpl::GetRenderWidgetSnapshotTaker() {
   return render_widget_snapshot_taker_.get();
 }