summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 21:14:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 21:14:50 +0000
commitc96d2673e03f87d0a39efe047df517a87fdd9ec7 (patch)
tree75e2362bcae09b90598fa2c17a19c6ad5c9306bf /chrome/browser/bookmarks
parent041591e177a759271eaf6b334a87f678bb2e9d62 (diff)
downloadchromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.zip
chromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.tar.gz
chromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.tar.bz2
Revert 56742 - A new field to describe the sources of history urls(visits) is added. This field is recorded in visit_database.
So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review=http://codereview.chromium.org/2906004/show Patch by weili@google.com TBR=brettw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_html_writer_unittest.cc3
-rw-r--r--chrome/browser/bookmarks/bookmark_model_unittest.cc2
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 90ad16b..40f5110 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -193,8 +193,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
const BookmarkNode* f1 = model->AddGroup(
model->GetBookmarkBarNode(), 0, f1_title);
model->AddURLWithCreationTime(f1, 0, url1_title, url1, t1);
- profile.GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(url1,
- history::SOURCE_BROWSED);
+ profile.GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(url1);
profile.GetFaviconService(Profile::EXPLICIT_ACCESS)->SetFavicon(url1,
url1_favicon,
icon_data);
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index c21104c..f588068 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -948,7 +948,7 @@ TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) {
profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(
url, NULL, 1, GURL(), PageTransition::TYPED,
- history::RedirectList(), history::SOURCE_BROWSED, false);
+ history::RedirectList(), false);
// This won't actually delete the URL, rather it'll empty out the visits.
// This triggers blocking on the BookmarkModel.