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

content/renderer/history_controller.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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 80 matching lines @@
         std::make_pair(main_frame, provisional_entry_->root()));
   }
 
   bool has_main_frame_request = false;
   for (const auto& item : same_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(
-        base::WrapUnique(new NavigationParams(*navigation_params_.get())));
+        base::MakeUnique<NavigationParams>(*navigation_params_.get()));
     WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem(
         item.second, cache_policy);
     frame->toWebLocalFrame()->load(
         request, blink::WebFrameLoadType::BackForward, item.second,
         blink::WebHistorySameDocumentLoad);
     if (frame == main_frame)
       has_main_frame_request = true;
   }
   for (const auto& item : different_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(
-        base::WrapUnique(new NavigationParams(*navigation_params_.get())));
+        base::MakeUnique<NavigationParams>(*navigation_params_.get()));
     WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem(
         item.second, cache_policy);
     frame->toWebLocalFrame()->load(
         request, blink::WebFrameLoadType::BackForward, item.second,
         blink::WebHistoryDifferentDocumentLoad);
     if (frame == main_frame)
       has_main_frame_request = true;
   }
 
   return has_main_frame_request;
@@ skipping 170 matching lines @@
 }
 
 HistoryEntry* HistoryController::GetCurrentEntry() {
   return current_entry_.get();
 }
 
 WebHistoryItem HistoryController::GetItemForNewChildFrame(
     RenderFrameImpl* frame) const {
   if (navigation_params_.get()) {
     frame->SetPendingNavigationParams(
-        base::WrapUnique(new NavigationParams(*navigation_params_.get())));
+        base::MakeUnique<NavigationParams>(*navigation_params_.get()));
   }
 
   if (!current_entry_)
     return WebHistoryItem();
   return current_entry_->GetItemForFrame(frame);
 }
 
 void HistoryController::RemoveChildrenForRedirect(RenderFrameImpl* frame) {
   if (!provisional_entry_)
     return;
   if (HistoryEntry::HistoryNode* node =
           provisional_entry_->GetHistoryNodeForFrame(frame))
     node->RemoveChildren();
 }
 
 void HistoryController::CreateNewBackForwardItem(
     RenderFrameImpl* target_frame,
     const WebHistoryItem& new_item,
     bool clone_children_of_target) {
   if (!current_entry_) {
     current_entry_.reset(new HistoryEntry(new_item));
   } else {
     current_entry_.reset(current_entry_->CloneAndReplace(
         new_item, clone_children_of_target, target_frame, render_view_));
   }
 }
 
 }  // namespace content