Move bookmark_utils into bookmarks namespace.

components/bookmarks/browser/bookmark_utils.cc

 // 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.
 
 #include "components/bookmarks/browser/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/query_parser/query_parser.h"
 #include "net/base/net_util.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "url/gurl.h"
 
 using base::Time;
-using bookmarks::BookmarkClient;
+
+namespace bookmarks {
 
 namespace {
 
 // The maximum length of URL or title returned by the Cleanup functions.
 const size_t kCleanedUpUrlMaxLength = 1024u;
 const size_t kCleanedUpTitleMaxLength = 1024u;
 
 void CloneBookmarkNodeImpl(BookmarkModel* model,
                            const BookmarkNodeData::Element& element,
                            const BookmarkNode* parent,
@@ skipping 97 matching lines @@
   if (url[kCleanedUpUrlMaxLength - 1] == '%')
     return url.substr(0, kCleanedUpUrlMaxLength - 1);
   if (url[kCleanedUpUrlMaxLength - 2] == '%')
     return url.substr(0, kCleanedUpUrlMaxLength - 2);
 
   return url.substr(0, kCleanedUpUrlMaxLength);
 }
 
 }  // namespace
 
-namespace bookmark_utils {
-
 QueryFields::QueryFields() {}
 QueryFields::~QueryFields() {}
 
 void CloneBookmarkNode(BookmarkModel* model,
                        const std::vector<BookmarkNodeData::Element>& elements,
                        const BookmarkNode* parent,
                        int index_to_add_at,
                        bool reset_node_times) {
   if (!parent->is_folder() || !model) {
     NOTREACHED();
@@ skipping 274 matching lines @@
 bool IsBookmarkedByUser(BookmarkModel* model, const GURL& url) {
   std::vector<const BookmarkNode*> nodes;
   model->GetNodesByURL(url, &nodes);
   for (size_t i = 0; i < nodes.size(); ++i) {
     if (model->client()->CanBeEditedByUser(nodes[i]))
       return true;
   }
   return false;
 }
 
-}  // namespace bookmark_utils
-
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) {
   // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
   return GetNodeByID(model->root_node(), id);
 }
+
+}  // namespace bookmarks