history: Move kBookmarkBarID constant out of HistoryService.

chrome/browser/history/starred_url_database_unittest.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 <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
@@ skipping 101 matching lines @@
   g_entry.folder_id = 100;
   CreateStarredEntry(&g_entry);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure no new entries were added.
   ASSERT_EQ(initial_count + 1, GetStarredEntryCount());
 
   // Make sure the folder was moved to the bookmark bar folder.
   ASSERT_TRUE(GetStarredEntry(g_entry.id, &g_entry));
-  ASSERT_EQ(HistoryService::kBookmarkBarID, g_entry.parent_folder_id);
+  ASSERT_EQ(kBookmarkBarID, g_entry.parent_folder_id);
   ASSERT_EQ(0, g_entry.visual_order);
 }
 
 TEST_F(StarredURLDatabaseTest, FixOrphanedBookmarks) {
   const int initial_count = GetStarredEntryCount();
 
   // Create two bookmarks that aren't in a random folder no on the bookmark bar.
   StarredEntry entry1;
   entry1.parent_folder_id = 100;
   entry1.visual_order = 10;
   entry1.url = GURL("http://google.com/1");
   CreateStarredEntry(&entry1);
 
   StarredEntry entry2;
   entry2.parent_folder_id = 101;
   entry2.visual_order = 20;
   entry2.url = GURL("http://google.com/2");
   CreateStarredEntry(&entry2);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure no new entries were added.
   ASSERT_EQ(initial_count + 2, GetStarredEntryCount());
 
   // Make sure the entries were moved to the bookmark bar and the visual order
   // order was updated appropriately.
   ASSERT_TRUE(GetStarredEntry(entry1.id, &entry1));
-  ASSERT_EQ(HistoryService::kBookmarkBarID, entry1.parent_folder_id);
+  ASSERT_EQ(kBookmarkBarID, entry1.parent_folder_id);
 
   ASSERT_TRUE(GetStarredEntry(entry2.id, &entry2));
-  ASSERT_EQ(HistoryService::kBookmarkBarID, entry2.parent_folder_id);
+  ASSERT_EQ(kBookmarkBarID, entry2.parent_folder_id);
   ASSERT_TRUE((entry1.visual_order == 0 && entry2.visual_order == 1) ||
               (entry1.visual_order == 1 && entry2.visual_order == 0));
 }
 
 TEST_F(StarredURLDatabaseTest, FixFolderCycleDepth0) {
   const int initial_count = GetStarredEntryCount();
 
   // Create a folder that is parented to itself.
   StarredEntry entry1;
   entry1.folder_id = entry1.parent_folder_id = 100;
   entry1.visual_order = 10;
   entry1.type = StarredEntry::USER_FOLDER;
   CreateStarredEntry(&entry1);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure no new entries were added.
   ASSERT_EQ(initial_count + 1, GetStarredEntryCount());
 
   // Make sure the folder were moved to the bookmark bar and the visual order
   // order was updated appropriately.
   ASSERT_TRUE(GetStarredEntry(entry1.id, &entry1));
-  ASSERT_EQ(HistoryService::kBookmarkBarID, entry1.parent_folder_id);
+  ASSERT_EQ(kBookmarkBarID, entry1.parent_folder_id);
   ASSERT_EQ(0, entry1.visual_order);
 }
 
 TEST_F(StarredURLDatabaseTest, FixFolderCycleDepth1) {
   const int initial_count = GetStarredEntryCount();
 
   StarredEntry entry1;
   entry1.folder_id = 100;
   entry1.parent_folder_id = 101;
   entry1.visual_order = 10;
   entry1.type = StarredEntry::USER_FOLDER;
   CreateStarredEntry(&entry1);
 
   StarredEntry entry2;
   entry2.folder_id = 101;
   entry2.parent_folder_id = 100;
   entry2.visual_order = 11;
   entry2.type = StarredEntry::USER_FOLDER;
   CreateStarredEntry(&entry2);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure no new entries were added.
   ASSERT_EQ(initial_count + 2, GetStarredEntryCount());
 
   // Because the folders caused a cycle, entry1 is moved the bookmark bar, which
   // breaks the cycle.
   ASSERT_TRUE(GetStarredEntry(entry1.id, &entry1));
   ASSERT_TRUE(GetStarredEntry(entry2.id, &entry2));
-  ASSERT_EQ(HistoryService::kBookmarkBarID, entry1.parent_folder_id);
+  ASSERT_EQ(kBookmarkBarID, entry1.parent_folder_id);
   ASSERT_EQ(100, entry2.parent_folder_id);
   ASSERT_EQ(0, entry1.visual_order);
   ASSERT_EQ(0, entry2.visual_order);
 }
 
 TEST_F(StarredURLDatabaseTest, FixVisualOrder) {
   const int initial_count = GetStarredEntryCount();
 
   // Star two urls.
   StarredEntry entry1;
   entry1.url = GURL("http://google.com/1");
-  entry1.parent_folder_id = HistoryService::kBookmarkBarID;
+  entry1.parent_folder_id = kBookmarkBarID;
   entry1.visual_order = 5;
   CreateStarredEntry(&entry1);
 
   // Add url2 and star it.
   StarredEntry entry2;
   entry2.url = GURL("http://google.com/2");
-  entry2.parent_folder_id = HistoryService::kBookmarkBarID;
+  entry2.parent_folder_id = kBookmarkBarID;
   entry2.visual_order = 10;
   CreateStarredEntry(&entry2);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure no new entries were added.
   ASSERT_EQ(initial_count + 2, GetStarredEntryCount());
 
   StarredEntry entry;
   ASSERT_TRUE(GetStarredEntry(entry1.id, &entry));
   entry1.visual_order = 0;
   CompareEntryByID(entry1);
 
   ASSERT_TRUE(GetStarredEntry(entry2.id, &entry));
   entry2.visual_order = 1;
   CompareEntryByID(entry2);
 }
 
 TEST_F(StarredURLDatabaseTest, FixDuplicateFolderIDs) {
   const int initial_count = GetStarredEntryCount();
 
   // Create two folders with the same folder id.
   StarredEntry entry1;
   entry1.type = StarredEntry::USER_FOLDER;
   entry1.folder_id = 10;
-  entry1.parent_folder_id = HistoryService::kBookmarkBarID;
+  entry1.parent_folder_id = kBookmarkBarID;
   CreateStarredEntry(&entry1);
   StarredEntry entry2 = entry1;
   CreateStarredEntry(&entry2);
 
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // Make sure only one folder exists.
   ASSERT_EQ(initial_count + 1, GetStarredEntryCount());
 
   StarredEntry entry;
   ASSERT_TRUE(GetStarredEntry(entry1.id, &entry) ||
               GetStarredEntry(entry2.id, &entry));
 }
 
 TEST_F(StarredURLDatabaseTest, RemoveStarredEntriesWithEmptyURL) {
   const int initial_count = GetStarredEntryCount();
 
   StarredEntry entry;
   entry.url = GURL("http://google.com");
   entry.title = UTF8ToUTF16("FOO");
-  entry.parent_folder_id = HistoryService::kBookmarkBarID;
+  entry.parent_folder_id = kBookmarkBarID;
 
   ASSERT_NE(0, CreateStarredEntry(&entry));
 
   // Remove the URL.
   DeleteURLRow(entry.url_id);
 
   // Fix up the table.
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // The entry we just created should have been nuked.
   ASSERT_EQ(initial_count, GetStarredEntryCount());
 }
 
 }  // namespace history