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

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 0b9c32e2f22eaa628d19b6a9b7a30e20868c0b23..72f9ad1546a9c941ffea96b5e8ad58b90ecec7c7 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -13,11 +13,11 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
@@ -154,7 +154,7 @@ void MigrateChromiumShortcutsTask::MigrateWin7ShortcutsInPath(
   for (FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty();
        shortcut = shortcuts_enum.Next()) {
     // Load the shortcut.
-    ScopedComPtr<IShellLink> shell_link;
+    base::win::ScopedComPtr<IShellLink> shell_link;
     if (FAILED(shell_link.CreateInstance(CLSID_ShellLink,
                                          NULL,
                                          CLSCTX_INPROC_SERVER))) {
@@ -162,7 +162,7 @@ void MigrateChromiumShortcutsTask::MigrateWin7ShortcutsInPath(
       return;
     }
 
-    ScopedComPtr<IPersistFile> persist_file;
+    base::win::ScopedComPtr<IPersistFile> persist_file;
     if (FAILED(persist_file.QueryFrom(shell_link)) ||
         FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) {
       NOTREACHED();
@@ -248,7 +248,7 @@ bool MigrateChromiumShortcutsTask::GetShortcutAppId(
 
   app_id->clear();
 
-  ScopedComPtr<IPropertyStore> property_store;
+  base::win::ScopedComPtr<IPropertyStore> property_store;
   if (FAILED(property_store.QueryFrom(shell_link)))
     return false;