Kill PropertyBag, switch WebContents to SupportsUserData.

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

 // 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/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
-#include "base/property_bag.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
@@ skipping 58 matching lines @@
 NSColor* SuggestTextColor() {
   return [NSColor grayColor];
 }
 NSColor* SecureSchemeColor() {
   return ColorWithRGBBytes(0x07, 0x95, 0x00);
 }
 NSColor* SecurityErrorSchemeColor() {
   return ColorWithRGBBytes(0xa2, 0x00, 0x00);
 }
 
+const char kOmniboxViewMacStateKey[] = "OmniboxViewMacState";
+
 // Store's the model and view state across tab switches.
-struct OmniboxViewMacState {
+struct OmniboxViewMacState : public base::SupportsUserData::Data {
   OmniboxViewMacState(const OmniboxEditModel::State model_state,
                       const bool has_focus,
                       const NSRange& selection)
       : model_state(model_state),
         has_focus(has_focus),
         selection(selection) {
   }
+  virtual ~OmniboxViewMacState() {}
 
   const OmniboxEditModel::State model_state;
   const bool has_focus;
   const NSRange selection;
 };
 
-// Returns a lazily initialized property bag accessor for saving our
-// state in a WebContents.  When constructed |accessor| generates a
-// globally-unique id used to index into the per-tab PropertyBag used
-// to store the state data.
-base::PropertyAccessor<OmniboxViewMacState>* GetStateAccessor() {
-  CR_DEFINE_STATIC_LOCAL(
-      base::PropertyAccessor<OmniboxViewMacState>, accessor, ());
-  return &accessor;
-}
-
 // Accessors for storing and getting the state from the tab.
 void StoreStateToTab(WebContents* tab,
-                     const OmniboxViewMacState& state) {
-  GetStateAccessor()->SetProperty(tab->GetPropertyBag(), state);
+                     OmniboxViewMacState* state) {
+  tab->SetUserData(kOmniboxViewMacStateKey, state);
 }
 const OmniboxViewMacState* GetStateFromTab(const WebContents* tab) {
-  return GetStateAccessor()->GetProperty(tab->GetPropertyBag());
+  return static_cast<OmniboxViewMacState*>(
+      tab->GetUserData(&kOmniboxViewMacStateKey));
 }
 
 // Helper to make converting url_parse ranges to NSRange easier to
 // read.
 NSRange ComponentToNSRange(const url_parse::Component& component) {
   return NSMakeRange(static_cast<NSInteger>(component.begin),
                      static_cast<NSInteger>(component.len));
 }
 
 }  // namespace
@@ skipping 50 matching lines @@
 
   NSRange range;
   if (hasFocus) {
     range = GetSelectedRange();
   } else {
     // If we are not focussed, there is no selection.  Manufacture
     // something reasonable in case it starts to matter in the future.
     range = NSMakeRange(0, GetTextLength());
   }
 
-  OmniboxViewMacState state(model()->GetStateForTabSwitch(), hasFocus, range);
+  OmniboxViewMacState* state =
+      new OmniboxViewMacState(model()->GetStateForTabSwitch(), hasFocus, range);
   StoreStateToTab(tab, state);
 }
 
 void OmniboxViewMac::Update(const WebContents* tab_for_state_restoring) {
   // TODO(shess): It seems like if the tab is non-NULL, then this code
   // shouldn't need to be called at all.  When coded that way, I find
   // that the field isn't always updated correctly.  Figure out why
   // this is.  Maybe this method should be refactored into more
   // specific cases.
   bool user_visible = model()->UpdatePermanentText(toolbar_model()->GetText());
@@ skipping 783 matching lines @@
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return ([field_ currentEditor] ?
           [[[field_ currentEditor] string] length] :
           [[field_ stringValue] length]) - suggest_text_length_;
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return selection.length == 0 && selection.location == GetTextLength();
 }