Replace string16 with base::string16.

chrome/browser/bookmarks/bookmark_model.h

 // Copyright (c) 2012 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_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 59 matching lines @@
   // Creates a new node with an id of 0 and |url|.
   explicit BookmarkNode(const GURL& url);
   // Creates a new node with |id| and |url|.
   BookmarkNode(int64 id, const GURL& url);
 
   virtual ~BookmarkNode();
 
   // Set the node's internal title. Note that this neither invokes observers
   // nor updates any bookmark model this node may be in. For that functionality,
   // BookmarkModel::SetTitle(..) should be used instead.
-  virtual void SetTitle(const string16& title) OVERRIDE;
+  virtual void SetTitle(const base::string16& title) OVERRIDE;
 
   // Returns an unique id for this node.
   // For bookmark nodes that are managed by the bookmark model, the IDs are
   // persisted across sessions.
   int64 id() const { return id_; }
   void set_id(int64 id) { id_ = id; }
 
   const GURL& url() const { return url_; }
   void set_url(const GURL& url) { url_ = url; }
 
@@ skipping 224 matching lines @@
   // Inserts a copy of |node| into |new_parent| at |index|.
   void Copy(const BookmarkNode* node,
             const BookmarkNode* new_parent,
             int index);
 
   // Returns the favicon for |node|. If the favicon has not yet been
   // loaded it is loaded and the observer of the model notified when done.
   const gfx::Image& GetFavicon(const BookmarkNode* node);
 
   // Sets the title of |node|.
-  void SetTitle(const BookmarkNode* node, const string16& title);
+  void SetTitle(const BookmarkNode* node, const base::string16& title);
 
   // Sets the URL of |node|.
   void SetURL(const BookmarkNode* node, const GURL& url);
 
   // Sets the date added time of |node|.
   void SetDateAdded(const BookmarkNode* node, base::Time date_added);
 
   // Returns the set of nodes with the |url|.
   void GetNodesByURL(const GURL& url, std::vector<const BookmarkNode*>* nodes);
 
@@ skipping 19 matching lines @@
   // Blocks until loaded; this is NOT invoked on the main thread.
   // See BookmarkService for more details on this.
   virtual void BlockTillLoaded() OVERRIDE;
 
   // Returns the node with |id|, or NULL if there is no node with |id|.
   const BookmarkNode* GetNodeByID(int64 id) const;
 
   // Adds a new folder node at the specified position.
   const BookmarkNode* AddFolder(const BookmarkNode* parent,
                                 int index,
-                                const string16& title);
+                                const base::string16& title);
 
   // Adds a url at the specified position.
   const BookmarkNode* AddURL(const BookmarkNode* parent,
                              int index,
-                             const string16& title,
+                             const base::string16& title,
                              const GURL& url);
 
   // Adds a url with a specific creation date.
   const BookmarkNode* AddURLWithCreationTime(const BookmarkNode* parent,
                                              int index,
-                                             const string16& title,
+                                             const base::string16& title,
                                              const GURL& url,
                                              const base::Time& creation_time);
 
   // Sorts the children of |parent|, notifying observers by way of the
   // BookmarkNodeChildrenReordered method.
   void SortChildren(const BookmarkNode* parent);
 
   // Order the children of |parent| as specified in |ordered_nodes|.  This
   // function should only be used to reorder the child nodes of |parent| and
   // is not meant to move nodes between different parent. Notifies observers
   // using the BookmarkNodeChildrenReordered method.
   void ReorderChildren(const BookmarkNode* parent,
                        const std::vector<const BookmarkNode*>& ordered_nodes);
 
   // Sets the date when the folder was modified.
   void SetDateFolderModified(const BookmarkNode* node, const base::Time time);
 
   // Resets the 'date modified' time of the node to 0. This is used during
   // importing to exclude the newly created folders from showing up in the
   // combobox of most recently modified folders.
   void ResetDateFolderModified(const BookmarkNode* node);
 
   void GetBookmarksWithTitlesMatching(
-      const string16& text,
+      const base::string16& text,
       size_t max_count,
       std::vector<BookmarkTitleMatch>* matches);
 
   // Sets the store to NULL, making it so the BookmarkModel does not persist
   // any changes to disk. This is only useful during testing to speed up
   // testing.
   void ClearStore();
 
   // Returns the next node ID.
   int64 next_node_id() const { return next_node_id_; }
@@ skipping 152 matching lines @@
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_