Unify desktop and Android tab helper instantiation.

chrome/browser/prerender/prerender_contents.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 "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tab_contents.h"
+#include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_details.h"
@@ skipping 302 matching lines @@
   if (origin_ == ORIGIN_LOCAL_PREDICTOR &&
       IsLocalPredictorPrerenderAlwaysControlEnabled()) {
     return;
   }
 
   prerendering_has_started_ = true;
 
   alias_session_storage_namespace = session_storage_namespace->CreateAlias();
   prerender_contents_.reset(
       CreateWebContents(alias_session_storage_namespace.get()));
-  BrowserTabContents::AttachTabHelpers(prerender_contents_.get());
+  TabHelpers::AttachTabHelpers(prerender_contents_.get());
 #if defined(OS_ANDROID)
   // Delay icon fetching until the contents are getting swapped in
   // to conserve network usage in mobile devices.
   FaviconTabHelper::FromWebContents(
       prerender_contents_.get())->set_should_fetch_icons(false);
 #endif  // defined(OS_ANDROID)
   content::WebContentsObserver::Observe(prerender_contents_.get());
 
   web_contents_delegate_.reset(new WebContentsDelegateImpl(this));
   prerender_contents_.get()->SetDelegate(web_contents_delegate_.get());
@@ skipping 499 matching lines @@
   DCHECK_GE(cookie_status_, 0);
   DCHECK_LT(cookie_status_, kNumCookieStatuses);
 }
 
  void PrerenderContents::AddResourceThrottle(
      const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
    resource_throttles_.push_back(throttle);
  }
 
 }  // namespace prerender