(gcc) fix compilation of os_exchange_data_provider_aurax11.cc

ui/base/dragdrop/os_exchange_data_provider_aurax11.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 "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/file_info.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
@@ skipping 84 matching lines @@
 }
 
 SelectionFormatMap OSExchangeDataProviderAuraX11::GetFormatMap() const {
   // We return the |selection_owner_|'s format map instead of our own in case
   // ours has been modified since TakeOwnershipOfSelection() was called.
   return selection_owner_.selection_format_map();
 }
 
 std::unique_ptr<OSExchangeData::Provider>
 OSExchangeDataProviderAuraX11::Clone() const {
-  std::unique_ptr<OSExchangeDataProviderAuraX11> ret(
-      new OSExchangeDataProviderAuraX11());
+  OSExchangeDataProviderAuraX11* ret = new OSExchangeDataProviderAuraX11();
   ret->format_map_ = format_map_;
-  return ret;

[dcheng, 2016/07/27 17:05:44]

Please keep the original code and just use std::move() to convert.

[Mostyn Bramley-Moore, 2016/07/27 17:34:11]

Done.

+
+  return base::WrapUnique<OSExchangeData::Provider>(ret);
 }
 
 void OSExchangeDataProviderAuraX11::MarkOriginatedFromRenderer() {
   std::string empty;
   format_map_.Insert(atom_cache_.GetAtom(kRendererTaint),
                      scoped_refptr<base::RefCountedMemory>(
                          base::RefCountedString::TakeString(&empty)));
 }
 
 bool OSExchangeDataProviderAuraX11::DidOriginateFromRenderer() const {
@@ skipping 413 matching lines @@
   }
 
   return false;
 }
 
 std::vector< ::Atom> OSExchangeDataProviderAuraX11::GetTargets() const {
   return format_map_.GetTypes();
 }
 
 }  // namespace ui