Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

ui/base/dragdrop/os_exchange_data_provider_win.h

 // Copyright (c) 2011 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_WIN_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_WIN_H_
 #pragma once
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <string>
 
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 
 namespace ui {
 
 class DataObjectImpl : public DownloadFileObserver,
                        public IDataObject,
                        public IAsyncOperation {
  public:
   class Observer {
    public:
@@ skipping 81 matching lines @@
         delete medium;
       }
       if (downloader.get())
         downloader->Stop();
     }
   };
 
   typedef std::vector<StoredDataInfo*> StoredData;
   StoredData contents_;
 
-  ScopedComPtr<IDataObject> source_object_;
+  base::win::ScopedComPtr<IDataObject> source_object_;
 
   bool is_aborting_;
   bool in_async_mode_;
   bool async_operation_started_;
   Observer* observer_;
 };
 
 class OSExchangeDataProviderWin : public OSExchangeData::Provider {
  public:
   // Returns true if source has plain text that is a valid url.
@@ skipping 37 matching lines @@
   virtual bool HasURL() const;
   virtual bool HasFile() const;
   virtual bool HasFileContents() const;
   virtual bool HasHtml() const;
   virtual bool HasCustomFormat(OSExchangeData::CustomFormat format) const;
   virtual void SetDownloadFileInfo(
       const OSExchangeData::DownloadFileInfo& download_info);
 
  private:
   scoped_refptr<DataObjectImpl> data_;
-  ScopedComPtr<IDataObject> source_object_;
+  base::win::ScopedComPtr<IDataObject> source_object_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderWin);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_WIN_H_