Kill PropertyBag, switch WebContents to SupportsUserData.

chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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/views/tabs/tab_drag_controller_interactive_uitest.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/property_bag.h"
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 11 matching lines @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ui/aura/test/event_generator.h"
 #endif
 
 namespace test {
 
+namespace {
+
+const char kTabDragControllerInteractiveUITestUserDataKey[] =
+    "TabDragControllerInteractiveUITestUserData";
+
+class TabDragControllerInteractiveUITestUserData
+    : public base::SupportsUserData::Data {
+ public:
+  explicit TabDragControllerInteractiveUITestUserData(int id) : id_(id) {}
+  virtual ~TabDragControllerInteractiveUITestUserData() {}
+  int id() { return id_; }
+
+ private:
+  int id_;
+};
+
+}  // namespace
+
 class QuitDraggingObserver : public content::NotificationObserver {
  public:
   QuitDraggingObserver() {
     registrar_.Add(this, chrome::NOTIFICATION_TAB_DRAG_LOOP_DONE,
                    content::NotificationService::AllSources());
   }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     DCHECK_EQ(chrome::NOTIFICATION_TAB_DRAG_LOOP_DONE, type);
     MessageLoopForUI::current()->Quit();
     delete this;
   }
 
  private:
   virtual ~QuitDraggingObserver() {}
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(QuitDraggingObserver);
 };
 
 gfx::Point GetCenterInScreenCoordinates(const views::View* view) {
   gfx::Point center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &center);
   return center;
 }
 
-base::PropertyAccessor<int>* id_accessor() {
-  static base::PropertyAccessor<int>* accessor = NULL;
-  if (!accessor)
-    accessor = new base::PropertyAccessor<int>;
-  return accessor;
-}
-
 void SetID(content::WebContents* tab_contents, int id) {
-  id_accessor()->SetProperty(tab_contents->GetPropertyBag(), id);
+  tab_contents->SetUserData(&kTabDragControllerInteractiveUITestUserDataKey,
+                            new TabDragControllerInteractiveUITestUserData(id));
 }
 
 void ResetIDs(TabStripModel* model, int start) {
   for (int i = 0; i < model->count(); ++i)
     SetID(model->GetTabContentsAt(i)->web_contents(), start + i);
 }
 
 std::string IDString(TabStripModel* model) {
   std::string result;
   for (int i = 0; i < model->count(); ++i) {
     if (i != 0)
       result += " ";
-    int* id_value = id_accessor()->GetProperty(
-        model->GetTabContentsAt(i)->web_contents()->GetPropertyBag());
-    if (id_value)
-      result += base::IntToString(*id_value);
+    content::WebContents* contents = model->GetTabContentsAt(i)->web_contents();
+    TabDragControllerInteractiveUITestUserData* user_data =
+        static_cast<TabDragControllerInteractiveUITestUserData*>(
+            contents->GetUserData(
+                &kTabDragControllerInteractiveUITestUserDataKey));
+    if (user_data)
+      result += base::IntToString(user_data->id());
     else
       result += "?";
   }
   return result;
 }
 
 // Creates a listener that quits the message loop when no longer dragging.
 void QuitWhenNotDraggingImpl() {
   new QuitDraggingObserver();  // QuitDraggingObserver deletes itself.
 }
@@ skipping 715 matching lines @@
 
 #if defined(USE_ASH)
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 #else
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));
 #endif