Replace wstring with string16 in history. The only time wstring is used now in history is for bookmark-related stuff (the bookmarks system is still wstring-based).

The substantial change here is in RTL to make a string16 variant of the functions and in changing the WordIterator to use string16 (this cleaned up some weird utf-32 code).

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2808017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50597 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/history/snippet.h b/chrome/browser/history/snippet.h
index 2c911ba..9e92893 100644
--- a/chrome/browser/history/snippet.h
+++ b/chrome/browser/history/snippet.h
@@ -8,9 +8,10 @@
 #ifndef CHROME_BROWSER_HISTORY_SNIPPET_H__
 #define CHROME_BROWSER_HISTORY_SNIPPET_H__
 
-#include <string>
 #include <vector>
 
+#include "base/string16.h"
+
 class Snippet {
  public:
   // Each MatchPosition is the [begin, end) positions of a match within a
@@ -48,7 +49,7 @@ class Snippet {
   void ComputeSnippet(const MatchPositions& matches,
                       const std::string& document);
 
-  const std::wstring& text() const { return text_; }
+  const string16& text() const { return text_; }
   const MatchPositions& matches() const { return matches_; }
 
   // Efficiently swaps the contents of this snippet with the other.
@@ -59,7 +60,7 @@ class Snippet {
 
  private:
   // The text of the snippet.
-  std::wstring text_;
+  string16 text_;
 
   // The matches within text_.
   MatchPositions matches_;