Kill PropertyBag, switch WebContents to SupportsUserData.

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/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
@@ skipping 46 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/thumbnail_support.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
 
 namespace {
 
-static base::LazyInstance<base::PropertyAccessor<TabContents*> >
-    g_tab_contents_property_accessor = LAZY_INSTANCE_INITIALIZER;
+const char kTabContentsUserDataKey[] = "TabContentsUserData";
+
+class TabContentsUserData : public base::SupportsUserData::Data {
+ public:
+  explicit TabContentsUserData(TabContents* tab_contents)
+      : tab_contents_(tab_contents) {}
+  virtual ~TabContentsUserData() {}
+  TabContents* tab_contents() { return tab_contents_; }
+
+ private:
+  TabContents* tab_contents_;  // unowned
+};
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContents, public:
 
 TabContents::TabContents(WebContents* contents)
     : content::WebContentsObserver(contents),
       in_destructor_(false),
       web_contents_(contents) {
   DCHECK(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);
+  // Stash this in the WebContents.
+  contents->SetUserData(&kTabContentsUserDataKey,
+                        new TabContentsUserData(this));
 
   // Create the tab helpers.
   // restore_tab_helper because it sets up the tab ID, and other helpers may
   // rely on that.
   restore_tab_helper_.reset(new RestoreTabHelper(contents));
 
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents));
   autofill_manager_ = new AutofillManager(this);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExternalAutofillPopup)) {
@@ skipping 101 matching lines @@
   content::NotificationService::current()->Notify(
       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_property_accessor.Pointer();
-}
-
 TabContents* TabContents::Clone() {
   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_tab_contents->extension_tab_helper()->CopyStateFrom(
       *extension_tab_helper_.get());
   return new_tab_contents;
 }
 
 // static
 TabContents* TabContents::FromWebContents(WebContents* contents) {
-  TabContents** tab_contents =
-      property_accessor()->GetProperty(contents->GetPropertyBag());
+  TabContentsUserData* user_data = static_cast<TabContentsUserData*>(
+      contents->GetUserData(&kTabContentsUserDataKey));
 
-  return tab_contents ? *tab_contents : NULL;
+  return user_data ? user_data->tab_contents() : NULL;
 }
 
 // static
 const TabContents* TabContents::FromWebContents(const WebContents* contents) {
-  TabContents* const* tab_contents =
-      property_accessor()->GetProperty(contents->GetPropertyBag());
+  TabContentsUserData* user_data = static_cast<TabContentsUserData*>(
+      contents->GetUserData(&kTabContentsUserDataKey));
 
-  return tab_contents ? *tab_contents : NULL;
+  return user_data ? user_data->tab_contents() : NULL;
 }
 
 WebContents* TabContents::web_contents() const {
   return web_contents_.get();
 }
 
 Profile* TabContents::profile() const {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }
 
@@ skipping 11 matching lines @@
 #if defined(ENABLE_SESSION_SERVICE)
   SessionService* session =
       SessionServiceFactory::GetForProfile(profile());
   if (session) {
     session->SetTabUserAgentOverride(restore_tab_helper()->window_id(),
                                      restore_tab_helper()->session_id(),
                                      user_agent);
   }
 #endif
 }