TabContentsWrapper -> TabContents, part 2.

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 43 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif
 
 using content::WebContents;
 
 namespace {
 
 static base::LazyInstance<base::PropertyAccessor<TabContents*> >
-    g_tab_contents_wrapper_property_accessor = LAZY_INSTANCE_INITIALIZER;
+    g_tab_contents_property_accessor = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContents, public:
 
 TabContents::TabContents(WebContents* contents)
     : content::WebContentsObserver(contents),
       in_destructor_(false),
       web_contents_(contents) {
   DCHECK(contents);
-  DCHECK(!GetCurrentWrapperForContents(contents));
+  DCHECK(!GetOwningContentsForWebContents(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 97 matching lines @@
       chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       content::Source<TabContents>(this),
       content::NotificationService::NoDetails());
 
   // Need to tear down infobars before the WebContents goes away.
   // TODO(avi): Can we get this handled by the tab helper itself?
   infobar_tab_helper_.reset();
 }
 
 base::PropertyAccessor<TabContents*>* TabContents::property_accessor() {
-  return g_tab_contents_wrapper_property_accessor.Pointer();
+  return g_tab_contents_property_accessor.Pointer();
 }
 
 TabContents* TabContents::Clone() {
-  WebContents* new_contents = web_contents()->Clone();
-  TabContents* new_wrapper = new TabContents(new_contents);
+  WebContents* new_web_contents = web_contents()->Clone();
+  TabContents* new_tab_contents = new TabContents(new_web_contents);
 
   // TODO(avi): Can we generalize this so that knowledge of the functionings of
   // the tab helpers isn't required here?
-  new_wrapper->extension_tab_helper()->CopyStateFrom(
+  new_tab_contents->extension_tab_helper()->CopyStateFrom(
       *extension_tab_helper_.get());
-  return new_wrapper;
+  return new_tab_contents;
+}
+
+// static deprecated
+TabContents* TabContents::GetCurrentWrapperForContents(
+    WebContents* contents) {
+  return GetOwningContentsForWebContents(contents);
+}
+
+// static deprecated
+const TabContents* TabContents::GetCurrentWrapperForContents(
+    const WebContents* contents) {
+  return GetOwningContentsForWebContents(contents);
 }
 
 // static
-TabContents* TabContents::GetCurrentWrapperForContents(
+TabContents* TabContents::GetOwningContentsForWebContents(
     WebContents* contents) {
-  TabContents** wrapper =
+  TabContents** tab_contents =
       property_accessor()->GetProperty(contents->GetPropertyBag());
 
-  return wrapper ? *wrapper : NULL;
+  return tab_contents ? *tab_contents : NULL;
 }
 
 // static
-const TabContents* TabContents::GetCurrentWrapperForContents(
+const TabContents* TabContents::GetOwningContentsForWebContents(
     const WebContents* contents) {
-  TabContents* const* wrapper =
+  TabContents* const* tab_contents =
       property_accessor()->GetProperty(contents->GetPropertyBag());
 
-  return wrapper ? *wrapper : NULL;
+  return tab_contents ? *tab_contents : NULL;
 }
 
 WebContents* TabContents::web_contents() const {
   return web_contents_.get();
 }
 
 Profile* TabContents::profile() const {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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_);
 }