Add a browser test for safebrowsing service....

chrome/browser/safe_browsing/safe_browsing_database.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/time.h"
@@ skipping 117 matching lines @@
 }
 
 // Order |SBAddFullHash| on the prefix part.  |SBAddPrefixLess()| from
 // safe_browsing_store.h orders on both chunk-id and prefix.
 bool SBAddFullHashPrefixLess(const SBAddFullHash& a, const SBAddFullHash& b) {
   return a.full_hash.prefix < b.full_hash.prefix;
 }
 
 }  // 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() {
 }
 
 // static
 FilePath SafeBrowsingDatabase::BloomFilterForFilename(
     const FilePath& db_filename) {
   return FilePath(db_filename.value() + kBloomFilterFile);
 }
@@ skipping 531 matching lines @@
   const base::TimeTicks before = base::TimeTicks::Now();
   const bool write_ok = bloom_filter_->WriteFile(bloom_filter_filename_);
   VLOG(1) << "SafeBrowsingDatabaseNew wrote bloom filter in "
           << (base::TimeTicks::Now() - before).InMilliseconds() << " ms";
 
   if (!write_ok) {
     UMA_HISTOGRAM_COUNTS("SB2.FilterWriteFail", 1);
     RecordFailure(FAILURE_DATABASE_FILTER_WRITE);
   }
 }