| Index: chrome/browser/history/starred_url_database.cc
|
| diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
|
| index 38124aa241ea72e874f24cdc2474d9a6d68c1068..b56bcd9ad4ec8234440787c7e4f636cf58f56747 100644
|
| --- a/chrome/browser/history/starred_url_database.cc
|
| +++ b/chrome/browser/history/starred_url_database.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2006-2008 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.
|
|
|
| @@ -545,10 +545,10 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
|
| // Create the bookmark bar and other folder nodes.
|
| history::StarredEntry entry;
|
| entry.type = history::StarredEntry::BOOKMARK_BAR;
|
| - BookmarkNode bookmark_bar_node(0, GURL());
|
| + BookmarkNode bookmark_bar_node(NULL, GURL());
|
| bookmark_bar_node.Reset(entry);
|
| entry.type = history::StarredEntry::OTHER;
|
| - BookmarkNode other_node(0, GURL());
|
| + BookmarkNode other_node(NULL, GURL());
|
| other_node.Reset(entry);
|
|
|
| std::map<history::UIStarID, history::StarID> group_id_to_id_map;
|
| @@ -597,7 +597,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
|
| // encountering the details.
|
|
|
| // The created nodes are owned by the root node.
|
| - node = new BookmarkNode(0, i->url);
|
| + node = new BookmarkNode(NULL, i->url);
|
| id_to_node_map[i->id] = node;
|
| }
|
| node->Reset(*i);
|
| @@ -608,7 +608,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
|
| BookmarkNode* parent = id_to_node_map[parent_id];
|
| if (!parent) {
|
| // Haven't encountered the parent yet, create it now.
|
| - parent = new BookmarkNode(0, GURL());
|
| + parent = new BookmarkNode(NULL, GURL());
|
| id_to_node_map[parent_id] = parent;
|
| }
|
|
|
|
|