"Paste and go" state was being calculated wrong on views (at least). Fix by making this calculatio…

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"
@@ skipping 924 matching lines @@
     [editor replaceCharactersInRange:selectedRange withString:s];
     [editor didChangeText];
   }
 }
 
 bool OmniboxViewMac::CanPasteAndGo() {
   return model_->CanPasteAndGo(GetClipboardText());
 }
 
 int OmniboxViewMac::GetPasteActionStringId() {
-  DCHECK(CanPasteAndGo());
-
-  // Use PASTE_AND_SEARCH as the default fallback (although the DCHECK above
-  // should never trigger).
-  if (!model_->is_paste_and_search())
-    return IDS_PASTE_AND_GO;
-  else
-    return IDS_PASTE_AND_SEARCH;
+  string16 text(GetClipboardText());
+  DCHECK(model_->CanPasteAndGo(text));
+  return model_->IsPasteAndSearch(GetClipboardText()) ?
+      IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO;
 }
 
 void OmniboxViewMac::OnPasteAndGo() {
-  if (CanPasteAndGo())
-    model_->PasteAndGo();
+  string16 text(GetClipboardText());
+  if (model_->CanPasteAndGo(text))
+    model_->PasteAndGo(text);
 }
 
 void OmniboxViewMac::OnFrameChanged() {
   // TODO(shess): UpdatePopupAppearance() is called frequently, so it
   // should be really cheap, but in this case we could probably make
   // things even cheaper by refactoring between the popup-placement
   // code and the matrix-population code.
   popup_view_->UpdatePopupAppearance();
   model_->PopupBoundsChangedTo(popup_view_->GetTargetBounds());
 
@@ skipping 76 matching lines @@
 
 void OmniboxViewMac::PlaceCaretAt(NSUInteger pos) {
   DCHECK(pos <= GetTextLength());
   SetSelectedRange(NSMakeRange(pos, pos));
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return selection.length == 0 && selection.location == GetTextLength();
 }