Kill PropertyBag, switch WebContents to SupportsUserData.

chrome/browser/ui/views/omnibox/omnibox_view_win.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/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
 #include <richedit.h>
 #include <textserv.h>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
-#include "base/property_bag.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
@@ skipping 57 matching lines @@
 // A helper method for determining a valid drag operation given the allowed
 // operation.  We prefer copy over link.
 int CopyOrLinkDragOperation(int drag_operation) {
   if (drag_operation & ui::DragDropTypes::DRAG_COPY)
     return ui::DragDropTypes::DRAG_COPY;
   if (drag_operation & ui::DragDropTypes::DRAG_LINK)
     return ui::DragDropTypes::DRAG_LINK;
   return ui::DragDropTypes::DRAG_NONE;
 }
 
+const char kAutocompleteEditStateKey[] = "AutocompleteEditState";
+
 // The AutocompleteEditState struct contains enough information about the
 // OmniboxEditModel and OmniboxViewWin to save/restore a user's
 // typing, caret position, etc. across tab changes.  We explicitly don't
 // preserve things like whether the popup was open as this might be weird.
-struct AutocompleteEditState {
+struct AutocompleteEditState : public base::SupportsUserData::Data {
   AutocompleteEditState(const OmniboxEditModel::State& model_state,
                         const OmniboxViewWin::State& view_state)
       : model_state(model_state),
         view_state(view_state) {
   }
+  virtual ~AutocompleteEditState() {}
 
   const OmniboxEditModel::State model_state;
   const OmniboxViewWin::State view_state;
 };
 
 // Returns true if the current point is far enough from the origin that it
 // would be considered a drag.
 bool IsDrag(const POINT& origin, const POINT& current) {
   return views::View::ExceededDragThreshold(current.x - origin.x,
                                             current.y - origin.y);
@@ skipping 252 matching lines @@
 
   *lpPaint = paint_struct;
   return paint_struct.hdc;
 }
 
 // Intercepted method for EndPaint(). Must use __stdcall convention.
 BOOL WINAPI EndPaintIntercept(HWND hWnd, const PAINTSTRUCT* lpPaint) {
   return (edit_hwnd && (hWnd == edit_hwnd)) || ::EndPaint(hWnd, lpPaint);
 }
 
-// Returns a lazily initialized property bag accessor for saving our state in a
-// WebContents.
-base::PropertyAccessor<AutocompleteEditState>* GetStateAccessor() {
-  static base::PropertyAccessor<AutocompleteEditState> state;
-  return &state;
-}
-
 class PaintPatcher {
  public:
   PaintPatcher();
   ~PaintPatcher();
 
   void RefPatch();
   void DerefPatch();
 
  private:
   size_t refcount_;
@@ skipping 151 matching lines @@
   return parent_view_;
 }
 
 void OmniboxViewWin::SaveStateToTab(WebContents* tab) {
   DCHECK(tab);
 
   const OmniboxEditModel::State model_state(model()->GetStateForTabSwitch());
 
   CHARRANGE selection;
   GetSelection(selection);
-  GetStateAccessor()->SetProperty(tab->GetPropertyBag(),
-      AutocompleteEditState(
+  tab->SetUserData(
+      kAutocompleteEditStateKey,
+      new AutocompleteEditState(
           model_state,
           State(selection, saved_selection_for_focus_change_)));
 }
 
 void OmniboxViewWin::Update(const WebContents* tab_for_state_restoring) {
   const bool visibly_changed_permanent_text =
       model()->UpdatePermanentText(toolbar_model()->GetText());
 
   const ToolbarModel::SecurityLevel security_level =
       toolbar_model()->GetSecurityLevel();
@@ skipping 10 matching lines @@
   security_level_ = security_level;
 
   // When we're switching to a new tab, restore its state, if any.
   ScopedFreeze freeze(this, GetTextObjectModel());
   if (tab_for_state_restoring) {
     // Make sure we reset our own state first.  The new tab may not have any
     // saved state, or it may not have had input in progress, in which case we
     // won't overwrite all our local state.
     RevertAll();
 
-    const AutocompleteEditState* state = GetStateAccessor()->GetProperty(
-        tab_for_state_restoring->GetPropertyBag());
+    const AutocompleteEditState* state = static_cast<AutocompleteEditState*>(
+        tab_for_state_restoring->GetUserData(&kAutocompleteEditStateKey));
     if (state) {
       model()->RestoreState(state->model_state);
 
       // Restore user's selection.  We do this after restoring the user_text
       // above so we're selecting in the correct string.
       SetSelectionRange(state->view_state.selection);
       saved_selection_for_focus_change_ =
           state->view_state.saved_selection_for_focus_change;
     }
   } else if (visibly_changed_permanent_text) {
@@ skipping 2034 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }