Remove even more ATL dependencies.

app/os_exchange_data_win_unittest.cc

 // Copyright (c) 2006-2008 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 <atlbase.h>
-#include <shlobj.h>
-
 #include "app/os_exchange_data.h"
 #include "base/clipboard_util.h"
 #include "base/pickle.h"
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 17 matching lines @@
   EXPECT_EQ(url_spec, url.spec());
   // data gets freed when data2 releases the ref on it
   delete data2;
 }
 
 // Test getting using the IDataObject COM API
 TEST(OSExchangeDataTest, StringDataAccessViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   std::wstring input = L"O hai googlz.";
   data->SetString(input);
-  CComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IDataObject> com_data(data);
 
   FORMATETC format_etc =
       { CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   EXPECT_EQ(S_OK, com_data->QueryGetData(&format_etc));
 
   STGMEDIUM medium;
   EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium));
   std::wstring output =
       ScopedHGlobal<wchar_t>(medium.hGlobal).get();
   EXPECT_EQ(input, output);
   ReleaseStgMedium(&medium);
-
-  // data is freed automatically by CComPtr.
 }
 
 // Test setting using the IDataObject COM API
 TEST(OSExchangeDataTest, StringDataWritingViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   std::wstring input = L"http://www.google.com/";
 
-  CComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IDataObject> com_data(data);
 
   // Store data in the object using the COM SetData API.
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
   FORMATETC format_etc =
       { cfstr_ineturl, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   STGMEDIUM medium;
   medium.tymed = TYMED_HGLOBAL;
   HGLOBAL glob = GlobalAlloc(GPTR, sizeof(wchar_t) * (input.size() + 1));
   size_t stringsz = input.size();
   SIZE_T sz = GlobalSize(glob);
@@ skipping 14 matching lines @@
   GURL reference_url(input);
   EXPECT_EQ(reference_url.spec(), url_from_data.spec());
   // deleting data2 will free data because it holds a ref to it.
   delete data2;
 }
 
 TEST(OSExchangeDataTest, URLDataAccessViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   GURL url("http://www.google.com/");
   data->SetURL(url, L"");
-  CComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IDataObject> com_data(data);
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
   FORMATETC format_etc =
       { cfstr_ineturl, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   EXPECT_EQ(S_OK, com_data->QueryGetData(&format_etc));
 
   STGMEDIUM medium;
   EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium));
   std::wstring output =
       ScopedHGlobal<wchar_t>(medium.hGlobal).get();
   EXPECT_EQ(url.spec(), WideToUTF8(output));
   ReleaseStgMedium(&medium);
 }
 
 TEST(OSExchangeDataTest, MultipleFormatsViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   std::string url_spec = "http://www.google.com/";
   GURL url(url_spec);
   std::wstring text = L"O hai googlz.";
   data->SetURL(url, L"Google");
   data->SetString(text);
 
-  CComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IDataObject> com_data(data);
 
   CLIPFORMAT cfstr_ineturl = RegisterClipboardFormat(CFSTR_INETURL);
   FORMATETC url_format_etc =
       { cfstr_ineturl, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   EXPECT_EQ(S_OK, com_data->QueryGetData(&url_format_etc));
   FORMATETC text_format_etc =
       { CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   EXPECT_EQ(S_OK, com_data->QueryGetData(&text_format_etc));
 
   STGMEDIUM medium;
@@ skipping 14 matching lines @@
 
 TEST(OSExchangeDataTest, EnumerationViaCOM) {
   OSExchangeData* data = new OSExchangeData;
   data->SetURL(GURL("http://www.google.com/"), L"");
   data->SetString(L"O hai googlz.");
 
   CLIPFORMAT cfstr_file_group_descriptor =
       RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
   CLIPFORMAT text_x_moz_url = RegisterClipboardFormat(L"text/x-moz-url");
 
-  CComPtr<IDataObject> com_data(data);
-  CComPtr<IEnumFORMATETC> enumerator;
-  EXPECT_EQ(S_OK, com_data->EnumFormatEtc(DATADIR_GET, &enumerator));
+  ScopedComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IEnumFORMATETC> enumerator;
+  EXPECT_EQ(S_OK, com_data.get()->EnumFormatEtc(DATADIR_GET,
+                                                enumerator.Receive()));
 
   // Test that we can get one item.
   {
     // Explictly don't reset the first time, to verify the creation state is
     // OK.
     ULONG retrieved = 0;
     FORMATETC elements_array[1];
     EXPECT_EQ(S_OK, enumerator->Next(1,
         reinterpret_cast<FORMATETC*>(&elements_array), &retrieved));
     EXPECT_EQ(1, retrieved);
@@ skipping 31 matching lines @@
         reinterpret_cast<FORMATETC*>(&elements_array), &retrieved));
     EXPECT_EQ(1, retrieved);
     EXPECT_EQ(cfstr_file_group_descriptor, elements_array[0].cfFormat);
   }
 
   // Test that we can skip the first item, and create a clone that matches in
   // this state, and modify the original without affecting the clone.
   {
     EXPECT_EQ(S_OK, enumerator->Reset());
     EXPECT_EQ(S_OK, enumerator->Skip(1));
-    CComPtr<IEnumFORMATETC> cloned_enumerator;
-    EXPECT_EQ(S_OK, enumerator->Clone(&cloned_enumerator));
-    EXPECT_EQ(S_OK, enumerator->Reset());
+    ScopedComPtr<IEnumFORMATETC> cloned_enumerator;
+    EXPECT_EQ(S_OK, enumerator.get()->Clone(cloned_enumerator.Receive()));
+    EXPECT_EQ(S_OK, enumerator.get()->Reset());
 
     {
       ULONG retrieved = 0;
       FORMATETC elements_array[1];
       EXPECT_EQ(S_OK, cloned_enumerator->Next(1,
           reinterpret_cast<FORMATETC*>(&elements_array), &retrieved));
       EXPECT_EQ(1, retrieved);
       EXPECT_EQ(cfstr_file_group_descriptor, elements_array[0].cfFormat);
     }
 
@@ skipping 24 matching lines @@
   EXPECT_TRUE(data2->GetURLAndTitle(&output_url, &output_title));
   EXPECT_EQ(url_spec, output_url.spec());
   EXPECT_EQ(url_title, output_title);
   std::wstring output_string;
 
   // URL should be the raw text response
   EXPECT_TRUE(data2->GetString(&output_string));
   EXPECT_EQ(url_spec, WideToUTF8(output_string));
 
   // File contents access via COM
-  CComPtr<IDataObject> com_data(data);
+  ScopedComPtr<IDataObject> com_data(data);
   {
     CLIPFORMAT cfstr_file_contents =
         RegisterClipboardFormat(CFSTR_FILECONTENTS);
     FORMATETC format_etc =
         { cfstr_file_contents, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
     EXPECT_EQ(S_OK, com_data->QueryGetData(&format_etc));
 
     STGMEDIUM medium;
     EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium));
     ScopedHGlobal<char> glob(medium.hGlobal);
@@ skipping 85 matching lines @@
   scoped_refptr<OSExchangeData> data(new OSExchangeData);
   data->SetString(L"http://google.com");
 
   scoped_ptr<OSExchangeData> data2(new OSExchangeData(data.get()));
   ASSERT_TRUE(data2->HasURL());
   GURL read_url;
   std::wstring title;
   EXPECT_TRUE(data2->GetURLAndTitle(&read_url, &title));
   EXPECT_EQ(GURL("http://google.com"), read_url);
 }