From bef12f40253f48b56a69e59746f52214727080de Mon Sep 17 00:00:00 2001 From: "lzheng@chromium.org" Date: Mon, 13 Dec 2010 23:46:19 +0000 Subject: Add a browser test for safebrowsing service. BUG=none TEST=safe_browsing_service_browsertest Review URL: http://codereview.chromium.org/5544008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69072 0039d316-1c4b-4281-b951-d872f2087c98 --- .../safe_browsing/safe_browsing_database.cc | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'chrome/browser/safe_browsing/safe_browsing_database.cc') diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 49c8101..590be6b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -135,14 +135,33 @@ bool SBAddFullHashPrefixLess(const SBAddFullHash& a, const SBAddFullHash& b) { } // namespace -// Factory method. +// The default SafeBrowsingDatabaseFactory. +class SafeBrowsingDatabaseFactoryImpl : public SafeBrowsingDatabaseFactory { + public: + virtual SafeBrowsingDatabase* CreateSafeBrowsingDatabase() { + return new SafeBrowsingDatabaseNew(new SafeBrowsingStoreFile); + } + + SafeBrowsingDatabaseFactoryImpl() { } + + private: + DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseFactoryImpl); +}; + +// static +SafeBrowsingDatabaseFactory* SafeBrowsingDatabase::factory_ = NULL; + +// Factory method, non-thread safe. Caller has to make sure this s called +// on SafeBrowsing Thread. // TODO(shess): Milestone-7 is converting from SQLite-based // SafeBrowsingDatabaseBloom to the new file format with // SafeBrowsingDatabaseNew. Once that conversion is too far along to // consider reversing, circle back and lift SafeBrowsingDatabaseNew up // to SafeBrowsingDatabase and get rid of the abstract class. SafeBrowsingDatabase* SafeBrowsingDatabase::Create() { - return new SafeBrowsingDatabaseNew(new SafeBrowsingStoreFile); + if (!factory_) + factory_ = new SafeBrowsingDatabaseFactoryImpl(); + return factory_->CreateSafeBrowsingDatabase(); } SafeBrowsingDatabase::~SafeBrowsingDatabase() { -- cgit v1.1