Upstream rewrite of Instant.

chrome/renderer/searchbox.h

Index: chrome/renderer/searchbox.h
diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h
index 9f3c10443effe2d2ec45613c3615ac61c2d03865..c691c0af459fb2e6cfb1c045db35d907ec82b8d4 100644
--- a/chrome/renderer/searchbox.h
+++ b/chrome/renderer/searchbox.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
 #include "chrome/common/instant_types.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
@@ -24,32 +23,29 @@ class SearchBox : public content::RenderViewObserver,
   void SetSuggestions(const std::vector<std::string>& suggestions,
                       InstantCompleteBehavior behavior);
 
-  const string16& value() const { return value_; }
+  const std::string& value() const { return value_; }
   bool verbatim() const { return verbatim_; }
-  uint32 selection_start() const { return selection_start_; }
-  uint32 selection_end() const { return selection_end_; }
+  size_t selection_start() const { return selection_start_; }
+  size_t selection_end() const { return selection_end_; }
   gfx::Rect GetRect();
 
  private:
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  void OnChange(const string16& value,
+  void OnChange(const std::string& value,
                 bool verbatim,
-                int selection_start,
-                int selection_end);
-  void OnSubmit(const string16& value, bool verbatim);
-  void OnCancel();
+                size_t selection_start,
+                size_t selection_end);
+  void OnSubmit(const std::string& value);
+  void OnCancel(const std::string& value);
   void OnResize(const gfx::Rect& bounds);
-  void OnDetermineIfPageSupportsInstant(const string16& value,
-                                        bool verbatim,
-                                        int selection_start,
-                                        int selection_end);
+  void OnDetermineIfPageSupportsInstant();
 
   // Sets the searchbox values to their initial value.
   void Reset();
 
-  string16 value_;
+  std::string value_;
   bool verbatim_;
   uint32 selection_start_;
   uint32 selection_end_;