Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_database.cc

Issue 5544008: Add a browser test for safebrowsing service.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/safe_browsing_database.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_database.cc (revision 69048)
+++ chrome/browser/safe_browsing/safe_browsing_database.cc (working copy)
@@ -135,14 +135,33 @@
} // 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() {
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_database.h ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698