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

chrome/common/win_safe_util.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
 #include <shlobj.h>
 #include <shobjidl.h>
 
 #include "chrome/common/win_safe_util.h"
 
 #include "app/win/shell.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
+#include "base/win/scoped_comptr.h"
 
 namespace win_util {
 
 // This function implementation is based on the attachment execution
 // services functionally deployed with IE6 or Service pack 2. This
 // functionality is exposed in the IAttachmentExecute COM interface.
 // more information at:
 // http://msdn2.microsoft.com/en-us/library/ms647048.aspx
 bool SaferOpenItemViaShell(HWND hwnd, const std::wstring& window_title,
                            const FilePath& full_path,
                            const std::wstring& source_url) {
-  ScopedComPtr<IAttachmentExecute> attachment_services;
+  base::win::ScopedComPtr<IAttachmentExecute> attachment_services;
   HRESULT hr = attachment_services.CreateInstance(CLSID_AttachmentServices);
   if (FAILED(hr)) {
     // We don't have Attachment Execution Services, it must be a pre-XP.SP2
     // Windows installation, or the thread does not have COM initialized.
     if (hr == CO_E_NOTINITIALIZED) {
       NOTREACHED();
       return false;
     }
     return app::win::OpenItemViaShell(full_path);
   }
@@ skipping 65 matching lines @@
 
   if (!result || !flush_result || written != kIdentifierSize) {
     NOTREACHED();
     return false;
   }
 
   return true;
 }
 
 }  // namespace win_util