ui/base/dragdrop: Use base::string16 now that string16 was moved into base namespace.

ui/base/dragdrop/os_exchange_data_provider_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_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ skipping 38 matching lines @@
   void TakeOwnershipOfSelection() const;
 
   // Retrieves a list of types we're offering. Noop if we haven't taken the
   // selection.
   void RetrieveTargets(std::vector<Atom>* targets) const;
 
   // Makes a copy of the format map currently being offered.
   SelectionFormatMap GetFormatMap() const;
 
   // Overridden from OSExchangeData::Provider:
-  virtual void SetString(const string16& data) OVERRIDE;
-  virtual void SetURL(const GURL& url, const string16& title) OVERRIDE;
+  virtual void SetString(const base::string16& data) OVERRIDE;
+  virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE;
   virtual void SetFilename(const base::FilePath& path) OVERRIDE;
   virtual void SetFilenames(
       const std::vector<OSExchangeData::FileInfo>& filenames) OVERRIDE;
   virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
                               const Pickle& data) OVERRIDE;
-  virtual bool GetString(string16* data) const OVERRIDE;
-  virtual bool GetURLAndTitle(GURL* url, string16* title) const OVERRIDE;
+  virtual bool GetString(base::string16* data) const OVERRIDE;
+  virtual bool GetURLAndTitle(GURL* url, base::string16* title) const OVERRIDE;
   virtual bool GetFilename(base::FilePath* path) const OVERRIDE;
   virtual bool GetFilenames(
       std::vector<OSExchangeData::FileInfo>* filenames) const OVERRIDE;
   virtual bool GetPickledData(const OSExchangeData::CustomFormat& format,
                               Pickle* data) const OVERRIDE;
   virtual bool HasString() const OVERRIDE;
   virtual bool HasURL() const OVERRIDE;
   virtual bool HasFile() const OVERRIDE;
   virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const
       OVERRIDE;
 
-  virtual void SetHtml(const string16& html, const GURL& base_url) OVERRIDE;
-  virtual bool GetHtml(string16* html, GURL* base_url) const OVERRIDE;
+  virtual void SetHtml(const base::string16& html,
+                       const GURL& base_url) OVERRIDE;
+  virtual bool GetHtml(base::string16* html, GURL* base_url) const OVERRIDE;
   virtual bool HasHtml() const OVERRIDE;
   virtual void SetDragImage(const gfx::ImageSkia& image,
                             const gfx::Vector2d& cursor_offset) OVERRIDE;
   virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE;
   virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE;
 
   // Overridden from base::MessagePumpDispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
  private:
@@ skipping 33 matching lines @@
 
   // Takes a snapshot of |format_map_| and offers it to other windows.
   mutable SelectionOwner selection_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAuraX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_