history: Move kBookmarkBarID constant out of HistoryService.

chrome/browser/history/starred_url_database.cc

 // Copyright (c) 2011 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 "chrome/browser/history/starred_url_database.h"
 
 #include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
       node->set_type(BookmarkNode::SYNCED);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace
 
+// static
+const int64 StarredURLDatabase::kBookmarkBarID = 1;
+
 StarredURLDatabase::StarredURLDatabase() {
 }
 
 StarredURLDatabase::~StarredURLDatabase() {
 }
 
 bool StarredURLDatabase::MigrateBookmarksToFile(const FilePath& path) {
   if (!GetDB().DoesTableExist("starred"))
     return true;
 
@@ skipping 471 matching lines @@
     if (i->type != history::StarredEntry::URL) {
       folder_id_to_id_map[i->folder_id] = i->id;
       if (i->type == history::StarredEntry::OTHER) {
         other_folder_id = i->id;
         other_folder_folder_id = i->folder_id;
       }
     }
   }
 
   // Register the bookmark bar and other folder nodes in the maps.
-  id_to_node_map[HistoryService::kBookmarkBarID] = &bookmark_bar_node;
-  folder_id_to_id_map[HistoryService::kBookmarkBarID] =
-      HistoryService::kBookmarkBarID;
+  id_to_node_map[kBookmarkBarID] = &bookmark_bar_node;
+  folder_id_to_id_map[kBookmarkBarID] = kBookmarkBarID;
   if (other_folder_folder_id) {
     id_to_node_map[other_folder_id] = &other_node;
     folder_id_to_id_map[other_folder_folder_id] = other_folder_id;
   }
 
   // Iterate through the entries again creating the nodes.
   for (std::vector<history::StarredEntry>::iterator i = entries.begin();
        i != entries.end(); ++i) {
     if (!i->parent_folder_id) {
       DCHECK(i->type == history::StarredEntry::BOOKMARK_BAR ||
@@ skipping 37 matching lines @@
   scoped_ptr<Value> encoded_bookmarks(
       encoder.Encode(&bookmark_bar_node, &other_node, &synced_node));
   std::string content;
   base::JSONWriter::Write(encoded_bookmarks.get(), true, &content);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);
 }
 
 }  // namespace history