Kill PropertyBag, switch WebContents to SupportsUserData.

chrome/browser/ui/tabs/tab_strip_model_unittest.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/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/property_bag.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 85 matching lines @@
   // A dummy TabContents we give to callers that expect us to actually
   // build a Destinations tab for them.
   TabContents* dummy_contents_;
 
   // Whether to report that we need to run an unload listener before closing.
   bool run_unload_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStripDummyDelegate);
 };
 
+namespace {
+
+const char kTabStripModelTestIDUserDataKey[] = "TabStripModelTestIDUserData";
+
+class TabStripModelTestIDUserData : public base::SupportsUserData::Data {
+ public:
+  explicit TabStripModelTestIDUserData(int id) : id_(id) {}
+  virtual ~TabStripModelTestIDUserData() {}
+  int id() { return id_; }
+
+ private:
+  int id_;
+};
+
+}  // namespace
+
 class TabStripModelTest : public ChromeRenderViewHostTestHarness {
  public:
   TabStripModelTest() : browser_thread_(BrowserThread::UI, &message_loop_) {
   }
 
   TabContents* CreateTabContents() {
     return chrome::TabContentsFactory(profile(), NULL, MSG_ROUTING_NONE, NULL);
   }
 
   TabContents* CreateTabContentsWithSharedRPH(
@@ skipping 20 matching lines @@
   void GoForward(WebContents* contents) {
     controller().GoForward();
   }
 
   void SwitchTabTo(WebContents* contents) {
     // contents()->WasShown();
   }
 
   // Sets the id of the specified contents.
   void SetID(WebContents* contents, int id) {
-    GetIDAccessor()->SetProperty(contents->GetPropertyBag(), id);
+    contents->SetUserData(&kTabStripModelTestIDUserDataKey,
+                          new TabStripModelTestIDUserData(id));
   }
 
   // Returns the id of the specified contents.
   int GetID(WebContents* contents) {
-    return *GetIDAccessor()->GetProperty(contents->GetPropertyBag());
+    TabStripModelTestIDUserData* user_data =
+        static_cast<TabStripModelTestIDUserData*>(
+            contents->GetUserData(&kTabStripModelTestIDUserDataKey));
+
+    return user_data ? user_data->id() : -1;
   }
 
   // Returns the state of the given tab strip as a string. The state consists
   // of the ID of each tab contents followed by a 'p' if pinned. For example,
   // if the model consists of two tabs with ids 2 and 1, with the first
   // tab pinned, this returns "2p 1".
   std::string GetPinnedState(const TabStripModel& model) {
     std::string actual;
     for (int i = 0; i < model.count(); ++i) {
       if (i > 0)
@@ skipping 43 matching lines @@
     for (size_t i = 0; i < selection.size(); ++i) {
       int value;
       ASSERT_TRUE(base::StringToInt(selection[i], &value));
       selection_model.AddIndexToSelection(value);
     }
     selection_model.set_active(selection_model.selected_indices()[0]);
     model->SetSelectionFromModel(selection_model);
   }
 
  private:
-  base::PropertyAccessor<int>* GetIDAccessor() {
-    static base::PropertyAccessor<int> accessor;
-    return &accessor;
-  }
-
   content::TestBrowserThread browser_thread_;
 
   std::wstring test_dir_;
   std::wstring profile_path_;
 };
 
 class MockTabStripModelObserver : public TabStripModelObserver {
  public:
   MockTabStripModelObserver()
       : empty_(true),
@@ skipping 2168 matching lines @@
   ASSERT_EQ(1, observer.GetStateCount());
   MockTabStripModelObserver::State s(
       contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }