TabContentsWrapper -> TabContents, part 43.

chrome/browser/ui/tab_contents/tab_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/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
@@ skipping 55 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContents, public:
 
 TabContents::TabContents(WebContents* contents)
     : content::WebContentsObserver(contents),
       in_destructor_(false),
       web_contents_(contents) {
   DCHECK(contents);
-  DCHECK(!GetOwningTabContentsForWebContents(contents));
+  DCHECK(!FromWebContents(contents));
 
   chrome::SetViewType(contents, chrome::VIEW_TYPE_TAB_CONTENTS);
 
   // Stash this in the property bag so it can be retrieved without having to
   // go to a Browser.
   property_accessor()->SetProperty(contents->GetPropertyBag(), this);
 
   // Create the tab helpers.
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents));
   autofill_manager_ = new AutofillManager(this);
@@ skipping 126 matching lines @@
     WebContents* contents) {
   return FromWebContents(contents);
 }
 
 // static deprecated
 const TabContents* TabContents::GetCurrentWrapperForContents(
     const WebContents* contents) {
   return FromWebContents(contents);
 }
 
-// static deprecated
-TabContents* TabContents::GetOwningTabContentsForWebContents(
-    WebContents* contents) {
-  return FromWebContents(contents);
-}
-
-// static deprecated
-const TabContents* TabContents::GetOwningTabContentsForWebContents(
-    const WebContents* contents) {
-  return FromWebContents(contents);
-}
-
 // static
 TabContents* TabContents::FromWebContents(WebContents* contents) {
   TabContents** tab_contents =
       property_accessor()->GetProperty(contents->GetPropertyBag());
 
   return tab_contents ? *tab_contents : NULL;
 }
 
 // static
 const TabContents* TabContents::FromWebContents(const WebContents* contents) {
@@ skipping 13 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
 void TabContents::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }