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

content/test/content_test_suite.cc

Index: content/test/content_test_suite.cc
===================================================================
--- content/test/content_test_suite.cc	(revision 161275)
+++ content/test/content_test_suite.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "content/public/test/test_content_client_initializer.h"
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/test_aura_initializer.h"
@@ -60,6 +61,10 @@
 
   ContentTestSuiteBase::Initialize();
 
+  // Force unittests to run using en-US so if we test against string
+  // output, it'll pass regardless of the system language.
+  ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);