summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.h
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 19:46:56 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 19:46:56 +0000
commitd364c659874cdc48ea7d2e6e26c9df1335be1863 (patch)
tree03fcd110ac2678940127bb382d54b300794e0976 /chrome/test/testing_profile.h
parent83aad14e14607a1bf1bea7c94d2cf71324b8a2d0 (diff)
downloadchromium_src-d364c659874cdc48ea7d2e6e26c9df1335be1863.zip
chromium_src-d364c659874cdc48ea7d2e6e26c9df1335be1863.tar.gz
chromium_src-d364c659874cdc48ea7d2e6e26c9df1335be1863.tar.bz2
Makes the HistoryContentsProvider query bookmark titles. I nuked a
couple of fields that I felt were redundant. I'm pretty sure I got the same logic, but you better stare at this to convince yourself. BUG=1256202 TEST=covered by unit tests git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
-rw-r--r--chrome/test/testing_profile.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 3d8e04c..4ff9dbb 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -31,8 +31,15 @@ class TestingProfile : public Profile {
// the model is created. As TestingProfile deletes the directory containing
// the files used by HistoryService, the boolean only matters if you're
// recreating the BookmarkBarModel.
+ //
+ // NOTE: this does not block until the bookmarks are loaded. For that use
+ // BlockUntilBookmarkModelLoaded.
void CreateBookmarkBarModel(bool delete_file);
+ // Blocks until the BookmarkBarModel finishes loaded. This is NOT invoked
+ // from CreateBookmarkBarModel.
+ void BlockUntilBookmarkModelLoaded();
+
// Creates a TemplateURLModel. If not invoked the TemplateURLModel is NULL.
void CreateTemplateURLModel();