Address Mike's last complaint about Issue 114017.

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 namespace {
 
 // Store's the model and view state across tab switches.
 struct AutocompleteEditViewMacState {
   AutocompleteEditViewMacState(const AutocompleteEditModel::State model_state,
                                const bool has_focus, const NSRange& selection)
       : model_state(model_state),
         has_focus(has_focus),
         selection(selection) {
   }
 
   const AutocompleteEditModel::State model_state;
   const bool has_focus;
   const NSRange selection;
 };
 
 // Returns a lazily initialized property bag accessor for saving our
-// state in a TabContents.
+// state in a TabContents.  When constructed |accessor| generates a
+// globally-unique id used to index into the per-tab PropertyBag used
+// to store the state data.
 PropertyAccessor<AutocompleteEditViewMacState>* GetStateAccessor() {
-  static PropertyAccessor<AutocompleteEditViewMacState> state;
-  return &state;
+  static PropertyAccessor<AutocompleteEditViewMacState> accessor;
+  return &accessor;
 }
 
 // Accessors for storing and getting the state from the tab.
 void StoreStateToTab(TabContents* tab,
                      const AutocompleteEditViewMacState& state) {
   GetStateAccessor()->SetProperty(tab->property_bag(), state);
 }
 const AutocompleteEditViewMacState* GetStateFromTab(const TabContents* tab) {
   return GetStateAccessor()->GetProperty(tab->property_bag());
 }
@@ skipping 404 matching lines @@
 }
 
 - (void)controlTextDidEndEditing:(NSNotification*)aNotification {
   edit_view_->OnKillFocus();
 
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }
 
 @end