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

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
===================================================================
--- content/renderer/render_view_browsertest.cc	(revision 161275)
+++ content/renderer/render_view_browsertest.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "content/renderer/render_view_impl.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_client.h"
-#include "content/shell/shell_main_delegate.h"
 #include "content/test/mock_keyboard.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -142,11 +141,6 @@
     mock_keyboard_.reset(new MockKeyboard());
   }
 
-  virtual void SetUp() OVERRIDE {
-    content::RenderViewTest::SetUp();
-    content::ShellMainDelegate::InitializeResourceBundle();
-  }
-
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
   }