Bunch of match preview tweaks:

chrome/browser/autocomplete/autocomplete_edit.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
 #pragma once
 
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/common/notification_observer.h"
@@ skipping 116 matching lines @@
 
   Profile* profile() const { return profile_; }
 
   // Returns the current state.  This assumes we are switching tabs, and changes
   // the internal state appropriately.
   const State GetStateForTabSwitch();
 
   // Restores local state from the saved |state|.
   void RestoreState(const State& state);
 
-  // Returns the url and transition type for the current text. If the user has
-  // not edited the text this is the permanent url, otherwise it is the url the
-  // user would navigate to if they accept the current edit.
-  GURL CurrentURL(PageTransition::Type* transition_type);
+  // Returns the match for the current text. If the user has not edited the text
+  // this is the match corresponding to the permanent text.
+  AutocompleteMatch CurrentMatch();
 
   // Called when the user wants to export the entire current text as a URL.
   // Sets the url, and if known, the title and favicon.
   void GetDataForURLExport(GURL* url, std::wstring* title, SkBitmap* favicon);
 
   // If the user presses ctrl-enter, it means "add .com to the the end".  The
   // desired TLD is the TLD the user desires to add to the end of the current
   // input, if any, based on their control key state and any other actions
   // they've taken.
   std::wstring GetDesiredTLD() const;
@@ skipping 306 matching lines @@
   mutable GURL paste_and_go_url_;
   mutable PageTransition::Type paste_and_go_transition_;
   mutable GURL paste_and_go_alternate_nav_url_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditModel);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_