Merge 87772 - 2011-05-31 Kinuko Yasuda <kinuko@chromium.org>

Source/WebKit/chromium/src/StorageInfoChromium.cpp

Index: Source/WebKit/chromium/src/StorageInfoChromium.cpp
===================================================================
--- Source/WebKit/chromium/src/StorageInfoChromium.cpp	(revision 88168)
+++ Source/WebKit/chromium/src/StorageInfoChromium.cpp	(working copy)
@@ -52,7 +52,8 @@
 namespace {
 void fireStorageInfoErrorCallback(PassRefPtr<StorageInfoErrorCallback> errorCallback, ExceptionCode ec)
 {
-    ASSERT(errorCallback);
+    if (!errorCallback)
+        return;
     ExceptionCodeDescription description;
     getExceptionCodeDescription(ec, description);
     errorCallback->handleEvent(DOMCoreException::create(description).get());
@@ -71,7 +72,7 @@
         Document* document = static_cast<Document*>(context);
         WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
         webFrame->client()->queryStorageUsageAndQuota(webFrame, static_cast<WebStorageQuotaType>(storageType), new WebStorageQuotaCallbacksImpl(successCallback, errorCallback));
-    } else if (errorCallback) {
+    } else {
         // FIXME: calling this on worker is not yet supported.
         fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
     }
@@ -89,7 +90,7 @@
         Document* document = static_cast<Document*>(context);
         WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
         webFrame->client()->requestStorageQuota(webFrame, static_cast<WebStorageQuotaType>(storageType), newQuotaInBytes, new WebStorageQuotaCallbacksImpl(successCallback, errorCallback));
-    } else if (errorCallback) {
+    } else {
         // FIXME: calling this on worker is not yet supported.
         fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
     }