Convert page contents grabbing from wide to UTF16. The current code is a bit...

chrome/browser/history/text_database_manager.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_HISTORY_TEXT_DATABASE_MANAGER_H_
 #define CHROME_BROWSER_HISTORY_TEXT_DATABASE_MANAGER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 83 matching lines @@
   // automatically coalesced and added to the database some time in the future
   // using AddPageData().
   //
   // AddPageURL must be called for a given URL (+ its corresponding ID) before
   // either the title or body set. The visit ID specifies the visit that will
   // get updated to refer to the full text indexed information. The visit time
   // should be the time corresponding to that visit in the database.
   void AddPageURL(const GURL& url, URLID url_id, VisitID visit_id,
                   base::Time visit_time);
   void AddPageTitle(const GURL& url, const std::wstring& title);
-  void AddPageContents(const GURL& url, const std::wstring& body);
+  void AddPageContents(const GURL& url, const string16& body);
 
   // Adds the given data to the appropriate database file, returning true on
   // success. The visit database row identified by |visit_id| will be updated
   // to refer to the full text index entry. If the visit ID is 0, the visit
   // database will not be updated.
   bool AddPageData(const GURL& url,
                    URLID url_id,
                    VisitID visit_id,
                    base::Time visit_time,
                    const std::wstring& title,
-                   const std::wstring& body);
+                   const string16& body);
 
   // Deletes the instance of indexed data identified by the given time and URL.
   // Any changes will be tracked in the optional change set for use when calling
   // OptimizeChangedDatabases later. change_set can be NULL.
   void DeletePageData(base::Time time, const GURL& url,
                       ChangeSet* change_set);
 
   // The text database manager keeps a list of changes that are made to the
   // file AddPageURL/Title/Body that may not be committed to the database yet.
   // This function removes entires from this list happening between the given
@@ skipping 41 matching lines @@
   // visit, title, and body all come in at different times.
   class PageInfo {
    public:
     PageInfo(URLID url_id, VisitID visit_id, base::Time visit_time);
 
     // Getters.
     URLID url_id() const { return url_id_; }
     VisitID visit_id() const { return visit_id_; }
     base::Time visit_time() const { return visit_time_; }
     const std::wstring& title() const { return title_; }
-    const std::wstring& body() const { return body_; }
+    const string16& body() const { return body_; }
 
     // Setters, we can only update the title and body.
     void set_title(const std::wstring& ttl);
-    void set_body(const std::wstring& bdy);
+    void set_body(const string16& bdy);
 
     // Returns true if both the title or body of the entry has been set. Since
     // both the title and body setters will "fix" empty strings to be a space,
     // these indicate if the setter was ever called.
     bool has_title() const { return !title_.empty(); }
     bool has_body() { return !body_.empty(); }
 
     // Returns true if this entry was added too long ago and we should give up
     // waiting for more data. The current time is passed in as an argument so we
     // can check many without re-querying the timer.
     bool Expired(base::TimeTicks now) const;
 
    private:
     URLID url_id_;
     VisitID visit_id_;
 
     // Time of the visit of the URL. This will be the value stored in the URL
     // and visit tables for the entry.
     base::Time visit_time_;
 
     // When this page entry was created. We have a cap on the maximum time that
     // an entry will be in the queue before being flushed to the database.
     base::TimeTicks added_time_;
 
     // Will be the string " " when they are set to distinguish set and unset.
     std::wstring title_;
-    std::wstring body_;
+    string16 body_;
   };
 
   // Converts the given time to a database identifier or vice-versa.
   static TextDatabase::DBIdent TimeToID(base::Time time);
   static base::Time IDToTime(TextDatabase::DBIdent id);
 
   // Returns a text database for the given identifier or time. This file will
   // be created if it doesn't exist and |for_writing| is set. On error,
   // including the case where the file doesn't exist and |for_writing|
   // is false, it will return NULL.
@@ skipping 79 matching lines @@
   // This can be NULL if there are no indexers registered to receive indexing
   // data from us.
   const HistoryPublisher* history_publisher_;
 
   DISALLOW_COPY_AND_ASSIGN(TextDatabaseManager);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_TEXT_DATABASE_MANAGER_H_