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

content/renderer/renderer_accessibility_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 "base/utf_string_conversions.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/public/test/render_view_test.h"
-#include "content/shell/shell_main_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 using content::AccessibilityNodeData;
 
 class RendererAccessibilityTest : public content::RenderViewTest {
  public:
   RendererAccessibilityTest() {}
 
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
   }
 
   virtual void SetUp() {
     content::RenderViewTest::SetUp();
     sink_ = &render_thread_->sink();
-    content::ShellMainDelegate::InitializeResourceBundle();
   }
 
   void SetMode(AccessibilityMode mode) {
     view()->OnSetAccessibilityMode(mode);
   }
 
   void GetLastAccNotification(
       AccessibilityHostMsg_NotificationParams* params) {
     const IPC::Message* message =
         sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Notifications::ID);
@@ skipping 143 matching lines @@
   // Clear focus.
   {
     SCOPED_TRACE("Back to document.");
     sink_->ClearMessages();
     ExecuteJavaScript("document.activeElement.blur()");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 1);
   }
 }