Reland r161256: Fix the crash that was happening on the buildbot (but not trybots, for a strange re…

content/public/test/render_view_test.cc

Index: content/public/test/render_view_test.cc
===================================================================
--- content/public/test/render_view_test.cc	(revision 161275)
+++ content/public/test/render_view_test.cc	(working copy)
@@ -150,7 +150,12 @@
   // since we are using a MockRenderThread.
   RenderThreadImpl::RegisterSchemes();
 
-  //ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+  // This check is needed because when run under content_browsertests,
+  // ResourceBundle isn't initialized (since we have to use a diferent test
+  // suite implementation than for content_unittests). For browser_tests, this
+  // is already initialized.
+  if (!ResourceBundle::HasSharedInstance())
+    ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
   mock_process_.reset(new MockRenderProcess);