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

cloud_print/service/win/chrome_launcher.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 "cloud_print/service/win/chrome_launcher.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 121 matching lines @@
   }
 
   std::string refresh_token;
   if (!dictionary->GetString(prefs::kCloudPrintRobotRefreshToken,
                              &refresh_token) ||
       refresh_token.empty()) {
     return std::string();
   }
 
   // Remove everything except kCloudPrintRoot.
-  base::Value* cloud_print_root = NULL;
+  scoped_ptr<base::Value> cloud_print_root;
   dictionary->Remove(prefs::kCloudPrintRoot, &cloud_print_root);
   dictionary->Clear();
-  dictionary->Set(prefs::kCloudPrintRoot, cloud_print_root);
+  dictionary->Set(prefs::kCloudPrintRoot, cloud_print_root.release());
 
   dictionary->SetBoolean(prefs::kCloudPrintXmppPingEnabled, true);
   if (!proxy_id.empty())  // Reuse proxy id if we already had one.
     dictionary->SetString(prefs::kCloudPrintProxyId, proxy_id);
   std::string result;
   base::JSONWriter::WriteWithOptions(dictionary,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &result);
   return result;
 }
@@ skipping 181 matching lines @@
       }
     } else {
       LOG(ERROR) << "Chrome launch failed.";
       return result;
     }
   }
   NOTREACHED();
   return std::string();
 }