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

content/renderer/browser_plugin/browser_plugin_browsertest.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/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/public/common/content_constants.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/mock_browser_plugin.h"
 #include "content/renderer/browser_plugin/mock_browser_plugin_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
-#include "content/shell/shell_main_delegate.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 
 namespace {
 const char kHTMLForBrowserPluginObject[] =
   "<object id='browserplugin' width='640px' height='480px'"
   "  src='foo' type='%s'>";
 
@@ skipping 18 matching lines @@
 namespace content {
 
 BrowserPluginTest::BrowserPluginTest() {}
 
 BrowserPluginTest::~BrowserPluginTest() {}
 
 void BrowserPluginTest::SetUp() {
   GetContentClient()->set_renderer_for_testing(&content_renderer_client_);
   content::RenderViewTest::SetUp();
   browser_plugin_manager_.reset(new MockBrowserPluginManager());
-  content::ShellMainDelegate::InitializeResourceBundle();
 }
 
 void BrowserPluginTest::TearDown() {
   browser_plugin_manager_->Cleanup();
   content::RenderViewTest::TearDown();
 }
 
 std::string BrowserPluginTest::ExecuteScriptAndReturnString(
     const std::string& script) {
   v8::Handle<v8::Value>  value = GetMainFrame()->executeScriptAndReturnValue(
@@ skipping 416 matching lines @@
   EXPECT_STREQ(
       "The object has already navigated, so its partition cannot be changed.",
       title.c_str());
 
   partition_value = ExecuteScriptAndReturnString(
       "document.getElementById('browserplugin').partition");
   EXPECT_STREQ("storage", partition_value.c_str());
 }
 
 }  // namespace content