Move bookmark_utils into bookmarks namespace.

components/bookmarks/browser/bookmark_utils.h

 // Copyright 2014 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 COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 
 class BookmarkModel;
 class BookmarkNode;
 class GURL;
 
-namespace bookmarks {
-class BookmarkClient;
-}
-
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // A collection of bookmark utility functions used by various parts of the UI
 // that show bookmarks (bookmark manager, bookmark bar view, ...) and other
 // systems that involve indexing and searching bookmarks.
-namespace bookmark_utils {
+namespace bookmarks {
+
+class BookmarkClient;
 
 // Fields to use when finding matching bookmarks.
 struct QueryFields {
   QueryFields();
   ~QueryFields();
 
   scoped_ptr<base::string16> word_phrase_query;
   scoped_ptr<base::string16> url;
   scoped_ptr<base::string16> title;
 };
@@ skipping 101 matching lines @@
 
 // Returns true if all the |nodes| can be edited by the user,
 // as determined by BookmarkClient::CanBeEditedByUser().
 bool CanAllBeEditedByUser(bookmarks::BookmarkClient* client,
                           const std::vector<const BookmarkNode*>& nodes);
 
 // Returns true if |url| has a bookmark in the |model| that can be edited
 // by the user.
 bool IsBookmarkedByUser(BookmarkModel* model, const GURL& url);
 
-}  // namespace bookmark_utils
-
 // Returns the node with |id|, or NULL if there is no node with |id|.
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id);
 
+}  // namespace bookmarks
+
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_