Switch to using scoped_ptr with UserData

google_apis/gaia/gaia_auth_util.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 "google_apis/gaia/gaia_auth_util.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 namespace gaia {
 
@@ skipping 21 matching lines @@
       base::RemoveChars(parts[0], ".", &parts[0]);
   }
 
   std::string new_email = base::ToLowerASCII(base::JoinString(parts, "@"));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 class GaiaURLRequestUserData : public base::SupportsUserData::Data {
  public:
-  static base::SupportsUserData::Data* Create() {
-    return new GaiaURLRequestUserData();
+  static std::unique_ptr<base::SupportsUserData::Data> Create() {
+    return base::MakeUnique<GaiaURLRequestUserData>();
   }
 };
 
 }  // namespace
 
 
 ListedAccount::ListedAccount() {}
 
 ListedAccount::ListedAccount(const ListedAccount& other) = default;
 
@@ skipping 130 matching lines @@
   return request.GetUserData(kURLRequestUserDataKey) != nullptr;
 }
 
 void MarkURLFetcherAsGaia(net::URLFetcher* fetcher) {
   DCHECK(fetcher);
   fetcher->SetURLRequestUserData(kURLRequestUserDataKey,
                                  base::Bind(&GaiaURLRequestUserData::Create));
 }
 
 }  // namespace gaia