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

chrome/browser/extensions/settings/settings_api.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_api.h"
+
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/settings/settings_api.h"
+#include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 
 namespace {
 const char* kUnsupportedArgumentType = "Unsupported argument type";
 }  // namespace
 
 // SettingsFunction
 
 bool SettingsFunction::RunImpl() {
   SettingsFrontend* frontend =
       profile()->GetExtensionService()->settings_frontend();
   frontend->RunWithStorage(
       extension_id(),
       base::Bind(
           &SettingsFunction::RunWithStorageOnFileThread,
           this,
           frontend->GetObservers()));
   return true;
 }
 
 void SettingsFunction::RunWithStorageOnFileThread(
     scoped_refptr<SettingsObserverList> observers,
     SettingsStorage* storage) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  bool success = false;
-  if (storage) {
-    success = RunWithStorage(observers.get(), storage);
-  }
+  bool success = RunWithStorage(observers.get(), storage);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&SettingsFunction::SendResponse, this, success));
 }
 
 bool SettingsFunction::UseReadResult(
     const SettingsStorage::ReadResult& result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (result.HasError()) {
@@ skipping 128 matching lines @@
 }
 
 bool ClearSettingsFunction::RunWithStorage(
     scoped_refptr<SettingsObserverList> observers,
     SettingsStorage* storage) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return UseWriteResult(observers, storage->Clear());
 }
 
 }  // namespace extensions