Don't update our text from toolbar if the toolbar's text doesn't

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"
@@ skipping 184 matching lines @@
   StoreStateToTab(tab, state);
 }
 
 void AutocompleteEditViewMac::Update(
     const TabContents* 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.
-  const std::wstring text = toolbar_model_->GetText();
-  const bool user_visible = model_->UpdatePermanentText(text);
+  const bool user_visible =
+      model_->UpdatePermanentText(toolbar_model_->GetText());
 
   if (tab_for_state_restoring) {
     RevertAll();
 
     const AutocompleteEditViewMacState* state = 
         GetStateFromTab(tab_for_state_restoring);
     if (state) {
       // Should restore the user's text via SetUserText().
       model_->RestoreState(state->model_state);
 
@@ skipping 13 matching lines @@
 #endif
       }
     }
   } else if (user_visible) {
     // Restore everything to the baseline look.
     RevertAll();
     // TODO(shess): Figure out how this case is used, to make sure
     // we're getting the selection and popup right.
 
   } else {
-    // TODO(shess): Figure out how this case is used, to make sure
-    // we're getting the selection and popup right.
-    UpdateAndStyleText(text);
+    // TODO(shess): This corresponds to _win and _gtk, except those
+    // guard it with a test for whether the security level changed.
+    // But AFAICT, that can only change if the text changed, and that
+    // code compares the toolbar_model_ security level with the local
+    // security level.  Dig in and figure out why this isn't a no-op
+    // that should go away.
+    UpdateAndStyleText(GetText());
   }
 }
 
 void AutocompleteEditViewMac::OpenURL(const GURL& url,
                                       WindowOpenDisposition disposition,
                                       PageTransition::Type transition,
                                       const GURL& alternate_nav_url,
                                       size_t selected_line,
                                       const std::wstring& keyword) {
   // TODO(shess): Why is the caller passing an invalid url in the
@@ skipping 60 matching lines @@
 
   // TODO(shess): Verify that we should be stealing focus at this
   // point.
   SetSelectedRange(NSMakeRange(0, GetText().size()));
 }
 
 void AutocompleteEditViewMac::RevertAll() {
   ClosePopup();
   model_->Revert();
 
+  // TODO(shess): This should be a no-op, the results from GetText()
+  // could only get there via UpdateAndStyleText() in the first place.
+  // Dig into where this code can be called from and see if this line
+  // can be removed.
   UpdateAndStyleText(GetText());
   controller_->OnChanged();
 }
 
 void AutocompleteEditViewMac::UpdatePopup() {
   model_->SetInputInProgress(true);
   if (!model_->has_focus())
     return;
 
   // TODO(shess):
@@ skipping 283 matching lines @@
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }
 
 // Signal that we've lost focus when the window resigns key.
 - (void)windowDidResignKey:(NSNotification*)notification {
   edit_view_->OnDidResignKey();
 }
 
 @end