linux_aura: Redo how memory is handled in clipboard/drag code.

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ skipping 110 matching lines @@
   ::Atom DragOperationToAtom(int drag_operation);
 
   // Converts a single action atom to a drag operation.
   int AtomToDragOperation(::Atom atom);
 
   // During the blocking StartDragAndDrop() call, this converts the views-style
   // |drag_operation_| bitfield into a vector of Atoms to offer to other
   // processes.
   std::vector< ::Atom> GetOfferedDragOperations();
 
-  // This returns a newly allocated copy of the data we're offering in this
+  // This returns a representation of the data we're offering in this
   // drag. This is done to bypass an asynchronous roundtrip with the X11
   // server.
-  scoped_ptr<ui::SelectionFormatMap> CloneFormatMap() const;
+  ui::SelectionFormatMap GetFormatMap() const;
 
   // Handling XdndPosition can be paused while waiting for more data; this is
   // called either synchronously from OnXdndPosition, or asynchronously after
   // we've received data requested from the other window.
   void CompleteXdndPosition(::Window source_window,
                             const gfx::Point& screen_point);
 
   void SendXdndEnter(::Window dest_window);
   void SendXdndLeave(::Window dest_window);
   void SendXdndPosition(::Window dest_window,
@@ skipping 72 matching lines @@
   std::map< ::Window, ::Atom> negotiated_operation_;
 
   static std::map< ::Window, DesktopDragDropClientAuraX11*> g_live_client_map;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_