Fixup SimpleDomStorageSystem to no longer use obsolete WebKit API that required returns of previous…

webkit/tools/test_shell/simple_dom_storage_system.cc

 // Copyright (c) 2012 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 "webkit/tools/test_shell/simple_dom_storage_system.h"
 
 #include "base/auto_reset.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h"
@@ skipping 40 matching lines @@
 
 class SimpleDomStorageSystem::AreaImpl : public WebStorageArea {
  public:
   AreaImpl(const base::WeakPtr<SimpleDomStorageSystem>& parent,
           int namespace_id, const GURL& origin);
   virtual ~AreaImpl();
   virtual unsigned length() OVERRIDE;
   virtual WebString key(unsigned index) OVERRIDE;
   virtual WebString getItem(const WebString& key) OVERRIDE;
   virtual void setItem(const WebString& key, const WebString& newValue,
-                       const WebURL&, Result&, WebString& oldValue) OVERRIDE;
-  virtual void removeItem(const WebString& key, const WebURL& url,
-                          WebString& oldValue) OVERRIDE;
-  virtual void clear(const WebURL& url, bool& somethingCleared) OVERRIDE;
+                       const WebURL& pageUrl, Result&) OVERRIDE;
+  virtual void removeItem(const WebString& key,
+                          const WebURL& pageUrl) OVERRIDE;
+  virtual void clear(const WebURL& pageUrl) OVERRIDE;
 
  private:
   DomStorageHost* Host() {
     if (!parent_.get())
       return NULL;
     return parent_->host_.get();
   }
 
   base::WeakPtr<SimpleDomStorageSystem> parent_;
   int connection_id_;
@@ skipping 74 matching lines @@
 }
 
 WebString SimpleDomStorageSystem::AreaImpl::getItem(const WebString& key) {
   if (Host())
     return Host()->GetAreaItem(connection_id_, key);
   return NullableString16(true);
 }
 
 void SimpleDomStorageSystem::AreaImpl::setItem(
     const WebString& key, const WebString& newValue,
-    const WebURL& pageUrl, Result& result, WebString& oldValue) {
+    const WebURL& pageUrl, Result& result) {
   result = ResultBlockedByQuota;
-  oldValue = NullableString16(true);
   if (!Host())
     return;
 
   AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
-  NullableString16 old_value;
+  NullableString16 unused;
   if (!Host()->SetAreaItem(connection_id_, key, newValue, pageUrl,
-                           &old_value))
+                           &unused))
     return;
 
   result = ResultOK;
-  oldValue = old_value;
 }
 
 void SimpleDomStorageSystem::AreaImpl::removeItem(
-    const WebString& key, const WebURL& pageUrl, WebString& oldValue) {
-  oldValue = NullableString16(true);
+    const WebString& key, const WebURL& pageUrl) {
   if (!Host())
     return;
 
   AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
-  string16 old_value;
-  if (!Host()->RemoveAreaItem(connection_id_, key, pageUrl, &old_value))
+  string16 notused;
+  Host()->RemoveAreaItem(connection_id_, key, pageUrl, &notused);
+}
+
+void SimpleDomStorageSystem::AreaImpl::clear(const WebURL& pageUrl) {
+  if (!Host())
     return;
 
-  oldValue = old_value;
-}
-
-void SimpleDomStorageSystem::AreaImpl::clear(
-    const WebURL& pageUrl, bool& somethingCleared) {
-  if (Host()) {
-    AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
-    somethingCleared = Host()->ClearArea(connection_id_, pageUrl);
-    return;
-  }
-  somethingCleared = false;
+  AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
+  Host()->ClearArea(connection_id_, pageUrl);
 }
 
 // SimpleDomStorageSystem -----------------------------
 
 SimpleDomStorageSystem* SimpleDomStorageSystem::g_instance_;
 
 SimpleDomStorageSystem::SimpleDomStorageSystem()
     : weak_factory_(this),
       context_(new DomStorageContext(FilePath(), FilePath(), NULL, NULL)),
       host_(new DomStorageHost(context_)),
@@ skipping 75 matching lines @@
         key,
         old_value,
         new_value,
         area->origin(),
         page_url,
         session_namespace_for_event_dispatch,
         area_being_processed_,
         true  /* originatedInProcess */);
   }
 }