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

Fix up all the callers to use the new location and namespace.

Also, delete the stub file since it isn't included by anyone more.

(Note: This was a TODO for brettw).

BUG=None
TEST=None

R=brettw@chromium.org

Review URL: http://codereview.chromium.org/6825055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 11 deletions

diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index d321161..e1cf869 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -10,7 +10,7 @@
 #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 {
@@ -112,7 +112,7 @@ class DataObjectImpl : public DownloadFileObserver,
   typedef std::vector<StoredDataInfo*> StoredData;
   StoredData contents_;
 
-  ScopedComPtr<IDataObject> source_object_;
+  base::win::ScopedComPtr<IDataObject> source_object_;
 
   bool is_aborting_;
   bool in_async_mode_;
@@ -170,7 +170,7 @@ class OSExchangeDataProviderWin : public OSExchangeData::Provider {
 
  private:
   scoped_refptr<DataObjectImpl> data_;
-  ScopedComPtr<IDataObject> source_object_;
+  base::win::ScopedComPtr<IDataObject> source_object_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderWin);
 };
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index def16a7..dac0e06 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -50,7 +50,7 @@ TEST(OSExchangeDataTest, StringDataAccessViaCOM) {
   OSExchangeData data;
   std::wstring input = L"O hai googlz.";
   data.SetString(input);
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
 
   FORMATETC format_etc =
@@ -70,7 +70,7 @@ TEST(OSExchangeDataTest, StringDataWritingViaCOM) {
   OSExchangeData data;
   std::wstring input = L"http://www.google.com/";
 
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
 
   // Store data in the object using the COM SetData API.
@@ -104,7 +104,7 @@ TEST(OSExchangeDataTest, URLDataAccessViaCOM) {
   OSExchangeData data;
   GURL url("http://www.google.com/");
   data.SetURL(url, L"");
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
@@ -128,7 +128,7 @@ TEST(OSExchangeDataTest, MultipleFormatsViaCOM) {
   data.SetURL(url, L"Google");
   data.SetString(text);
 
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
@@ -164,9 +164,9 @@ TEST(OSExchangeDataTest, EnumerationViaCOM) {
       RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
   CLIPFORMAT text_x_moz_url = RegisterClipboardFormat(L"text/x-moz-url");
 
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
-  ScopedComPtr<IEnumFORMATETC> enumerator;
+  base::win::ScopedComPtr<IEnumFORMATETC> enumerator;
   EXPECT_EQ(S_OK, com_data.get()->EnumFormatEtc(DATADIR_GET,
                                                 enumerator.Receive()));
 
@@ -220,7 +220,7 @@ TEST(OSExchangeDataTest, EnumerationViaCOM) {
   {
     EXPECT_EQ(S_OK, enumerator->Reset());
     EXPECT_EQ(S_OK, enumerator->Skip(1));
-    ScopedComPtr<IEnumFORMATETC> cloned_enumerator;
+    base::win::ScopedComPtr<IEnumFORMATETC> cloned_enumerator;
     EXPECT_EQ(S_OK, enumerator.get()->Clone(cloned_enumerator.Receive()));
     EXPECT_EQ(S_OK, enumerator.get()->Reset());
 
@@ -267,7 +267,7 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) {
   EXPECT_EQ(url_spec, WideToUTF8(output_string));
 
   // File contents access via COM
-  ScopedComPtr<IDataObject> com_data(
+  base::win::ScopedComPtr<IDataObject> com_data(
       OSExchangeDataProviderWin::GetIDataObject(data));
   {
     CLIPFORMAT cfstr_file_contents =