Extension Settings API: make it so that when leveldb storage areas fail to be

chrome/browser/extensions/settings/settings_leveldb_storage.cc

 // Copyright (c) 2011 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/extensions/settings/settings_leveldb_storage.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 29 matching lines @@
 
  private:
   leveldb::DB* db_;
   const leveldb::Snapshot* snapshot_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedSnapshot);
 };
 
 }  // namespace
 
-/* static */
-SettingsLeveldbStorage* SettingsLeveldbStorage::Create(
-      const FilePath& base_path,
-      const std::string& extension_id) {
+// SettingsLeveldbStorage::Factory
+
+SettingsStorage* SettingsLeveldbStorage::Factory::Create(
+    const FilePath& base_path, const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   FilePath path = base_path.AppendASCII(extension_id);
 
 #if defined(OS_POSIX)
   std::string os_path(path.value());
 #elif defined(OS_WIN)
   std::string os_path = base::SysWideToUTF8(path.value());
 #endif
 
   leveldb::Options options;
   options.create_if_missing = true;
   leveldb::DB* db;
   leveldb::Status status = leveldb::DB::Open(options, os_path, &db);
   if (!status.ok()) {
     LOG(WARNING) << "Failed to create leveldb at " << path.value() <<
       ": " << status.ToString();
     return NULL;
   }
   return new SettingsLeveldbStorage(path, db);
 }
 
+// SettingsLeveldbStorage
+
 SettingsLeveldbStorage::SettingsLeveldbStorage(
     const FilePath& db_path, leveldb::DB* db)
     : db_path_(db_path), db_(db) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 }
 
 SettingsLeveldbStorage::~SettingsLeveldbStorage() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Delete the database from disk if it's empty.  This is safe on destruction,
@@ skipping 233 matching lines @@
   it->SeekToFirst();
   bool is_empty = !it->Valid();
   if (!it->status().ok()) {
     LOG(ERROR) << "Checking DB emptiness failed: " << it->status().ToString();
     return false;
   }
   return is_empty;
 }
 
 }  // namespace extensions