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

 // 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/public/test/render_view_test.h"
 
 #include "content/common/view_messages.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/renderer/render_thread_impl.h"
@@ skipping 132 matching lines @@
 
   // Setting flags and really doing anything with WebKit is fairly fragile and
   // hacky, but this is the world we live in...
   webkit_glue::SetJavaScriptFlags(" --expose-gc");
   WebKit::initialize(webkit_platform_support_.Get());
 
   // Ensure that we register any necessary schemes when initializing WebKit,
   // 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);
 
   // This needs to pass the mock render thread to the view.
   RenderViewImpl* view = RenderViewImpl::Create(
       0,
       kOpenerId,
       content::RendererPreferences(),
       webkit_glue::WebPreferences(),
       new SharedRenderViewCounter(0),
@@ skipping 197 matching lines @@
 
   ViewMsg_Navigate navigate_message(impl->GetRoutingID(), navigate_params);
   OnMessageReceived(navigate_message);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   ProcessPendingMessages();
 }
 
 }  // namespace content