Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

chrome/test/webdriver/commands/cookie_commands.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 "chrome/test/webdriver/commands/cookie_commands.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 19 matching lines @@
   return true;
 }
 
 bool CookieCommand::DoesPost() {
   return true;
 }
 
 void CookieCommand::ExecuteGet(Response* const response) {
   std::string url;
   Error* error = session_->GetURL(&url);
-  ListValue* cookies = NULL;
+  scoped_ptr<ListValue> cookies;
   if (!error)
     error = session_->GetCookies(url, &cookies);
   if (error) {
     response->SetError(error);
     return;
   }
-  response->SetValue(cookies);
+  response->SetValue(cookies.release());
 }
 
 void CookieCommand::ExecutePost(Response* const response) {
   const DictionaryValue* cookie_dict;
   if (!GetDictionaryParameter("cookie", &cookie_dict)) {
     response->SetError(new Error(
         kBadRequest, "Missing or invalid |cookie| parameter"));
     return;
   }
   scoped_ptr<DictionaryValue> cookie_dict_copy(cookie_dict->DeepCopy());
@@ skipping 18 matching lines @@
     error = session_->SetCookie(url, cookie_dict_copy.get());
   if (error) {
     response->SetError(error);
     return;
   }
 }
 
 void CookieCommand::ExecuteDelete(Response* const response) {
   std::string url;
   Error* error = session_->GetURL(&url);
-  ListValue* unscoped_cookies = NULL;
+  scoped_ptr<ListValue> cookies;
   if (!error)
-    error = session_->GetCookies(url, &unscoped_cookies);
-  scoped_ptr<ListValue> cookies(unscoped_cookies);
+    error = session_->GetCookies(url, &cookies);
   if (error) {
     response->SetError(error);
     return;
   }
 
   for (size_t i = 0; i < cookies->GetSize(); ++i) {
     DictionaryValue* cookie_dict;
     if (!cookies->GetDictionary(i, &cookie_dict)) {
       response->SetError(new Error(
           kUnknownError, "GetCookies returned non-dict type"));
@@ skipping 45 matching lines @@
   Error* error = session_->GetURL(&url);
   if (!error)
     error = session_->DeleteCookie(url, cookie_name_);
   if (error) {
     response->SetError(error);
     return;
   }
 }
 
 }  // namespace webdriver