Re-write many calls to WrapUnique() with MakeUnique()

components/signin/core/browser/webdata/token_web_data.cc

 // Copyright 2014 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 "components/signin/core/browser/webdata/token_web_data.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 32 matching lines @@
     if (TokenServiceTable::FromWebDatabase(db)->SetTokenForService(service,
                                                                    token)) {
       return WebDatabase::COMMIT_NEEDED;
     }
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
 
   std::unique_ptr<WDTypedResult> GetAllTokens(WebDatabase* db) {
     std::map<std::string, std::string> map;
     TokenServiceTable::FromWebDatabase(db)->GetAllTokens(&map);
-    return base::WrapUnique(
-        new WDResult<std::map<std::string, std::string>>(TOKEN_RESULT, map));
+    return base::MakeUnique<WDResult<std::map<std::string, std::string>>>(
+        TOKEN_RESULT, map);
   }
 
  protected:
   virtual ~TokenWebDataBackend() {
   }
 
  private:
   friend class base::RefCountedDeleteOnMessageLoop<TokenWebDataBackend>;
   friend class base::DeleteHelper<TokenWebDataBackend>;
 };
@@ skipping 34 matching lines @@
 
 TokenWebData::TokenWebData(
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread)
     : WebDataServiceBase(NULL, ProfileErrorCallback(), ui_thread),
       token_backend_(new TokenWebDataBackend(db_thread)) {
 }
 
 TokenWebData::~TokenWebData() {
 }