TabContentsWrapper -> TabContents, part 4.

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
@@ skipping 461 matching lines @@
                                       size_t index) {
   // We only care about cases where there is a selection (i.e. the popup is
   // open).
   if (popup_->IsOpen()) {
     AutocompleteLog log(
         autocomplete_controller_->input().text(),
         just_deleted_text_,
         autocomplete_controller_->input().type(),
         popup_->selected_line(),
         -1,  // don't yet know tab ID; set later if appropriate
-        ClassifyPage(controller_->GetTabContentsWrapper()->
+        ClassifyPage(controller_->GetTabContents()->
                      web_contents()->GetURL()),
         base::TimeTicks::Now() - time_user_first_modified_omnibox_,
         0,  // inline autocomplete length; possibly set later
         result());
     DCHECK(user_input_in_progress_) << "We didn't get here through the "
         "expected series of calls.  time_user_first_modified_omnibox_ is "
         "not set correctly and other things may be wrong.";
     if (index != AutocompletePopupModel::kNoMatch)
       log.selected_index = index;
     else if (!has_temporary_text_)
       log.inline_autocompleted_length = inline_autocomplete_text_.length();
     if (disposition == CURRENT_TAB) {
       // If we know the destination is being opened in the current tab,
       // we can easily get the tab ID.  (If it's being opened in a new
       // tab, we don't know the tab ID yet.)
-      log.tab_id = controller_->GetTabContentsWrapper()->
+      log.tab_id = controller_->GetTabContents()->
           restore_tab_helper()->session_id().id();
     }
     autocomplete_controller_->AddProvidersInfo(&log.providers_info);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
         content::Source<Profile>(profile_),
         content::Details<AutocompleteLog>(&log));
   }
 
   TemplateURL* template_url = match.GetTemplateURL(profile_);
@@ skipping 539 matching lines @@
   return false;
 }
 
 void AutocompleteEditModel::DoPrerender(const AutocompleteMatch& match) {
   // Do not prerender if the destination URL is the same as the current URL.
   if (match.destination_url == PermanentURL())
     return;
   // It's possible the tab strip does not have an active tab contents, for
   // instance if the tab has been closed or on return from a sleep state
   // (http://crbug.com/105689)
-  TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
+  TabContents* tab = controller_->GetTabContents();
   if (!tab)
     return;
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(tab->profile());
   if (prerender_manager) {
     content::RenderViewHost* current_host =
         tab->web_contents()->GetRenderViewHost();
     prerender_manager->AddPrerenderFromOmnibox(
         match.destination_url, current_host->GetSessionStorageNamespace());
   }
@@ skipping 32 matching lines @@
     return metrics::OmniboxEventProto_PageClassification_INVALID_SPEC;
   const std::string& url = gurl.spec();
   if (url == chrome::kChromeUINewTabURL)
     return metrics::OmniboxEventProto_PageClassification_NEW_TAB_PAGE;
   if (url == chrome::kAboutBlankURL)
     return metrics::OmniboxEventProto_PageClassification_BLANK;
   if (url == profile()->GetPrefs()->GetString(prefs::kHomePage))
     return metrics::OmniboxEventProto_PageClassification_HOMEPAGE;
   return metrics::OmniboxEventProto_PageClassification_OTHER;
 }