Bunch of match preview tweaks:

chrome/browser/location_bar.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.
 
 // The LocationBar class is a virtual interface, defining access to the
 // window's location bar component.  This class exists so that cross-platform
 // components like the browser command system can talk to the platform
 // specific implementations of the location bar control.  It also allows the
 // location bar to be mocked for testing.
 
 #ifndef CHROME_BROWSER_LOCATION_BAR_H_
 #define CHROME_BROWSER_LOCATION_BAR_H_
 #pragma once
 
 #include <string>
 
+#include "base/string16.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditView;
 class ExtensionAction;
 class LocationBarTesting;
 class TabContents;
 
 class LocationBar {
  public:
   // Shows the first run information bubble anchored to the location bar.
   virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) = 0;
 
-  // TODO: port
-#if defined(TOOLKIT_VIEWS)
   // Sets the suggested text to show in the omnibox. This is shown in addition
   // to the current text of the omnibox.
-  virtual void SetSuggestedText(const std::wstring& text) = 0;
-#endif
+  virtual void SetSuggestedText(const string16& text) = 0;
 
   // Returns the string of text entered in the location bar.
   virtual std::wstring GetInputString() const = 0;
 
   // Returns the WindowOpenDisposition that should be used to determine where
   // to open a URL entered in the location bar.
   virtual WindowOpenDisposition GetWindowOpenDisposition() const = 0;
 
   // Returns the PageTransition that should be recorded in history when the URL
   // entered in the location bar is loaded.
@@ skipping 52 matching lines @@
   virtual ExtensionAction* GetVisiblePageAction(size_t index) = 0;
 
   // Simulates a left mouse pressed on the visible page action at |index|.
   virtual void TestPageActionPressed(size_t index) = 0;
 
  protected:
   virtual ~LocationBarTesting() {}
 };
 
 #endif  // CHROME_BROWSER_LOCATION_BAR_H_