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

chrome/installer/util/shell_util_unittest.cc

-// Copyright (c) 2009 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 <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <fstream>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/shell_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 bool VerifyChromeShortcut(const std::wstring& exe_path,
                           const std::wstring& shortcut,
                           const std::wstring& description,
                           int icon_index) {
-  ScopedComPtr<IShellLink> i_shell_link;
-  ScopedComPtr<IPersistFile> i_persist_file;
+  base::win::ScopedComPtr<IShellLink> i_shell_link;
+  base::win::ScopedComPtr<IPersistFile> i_persist_file;
 
   // Get pointer to the IShellLink interface
   bool failed = FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL,
                                                    CLSCTX_INPROC_SERVER));
   EXPECT_FALSE(failed) << "Failed to get IShellLink";
   if (failed)
     return false;
 
   // Query IShellLink for the IPersistFile interface
   failed = FAILED(i_persist_file.QueryFrom(i_shell_link));
@@ skipping 116 matching lines @@
   // Now change only description to update shortcut and make sure icon index
   // doesn't change.
   const std::wstring description2(L"dummy description 2");
   EXPECT_TRUE(ShellUtil::UpdateChromeShortcut(dist, exe_path.value(),
                                               shortcut_path.value(),
                                               description2, false));
   EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
                                    shortcut_path.value(),
                                    description2, 1));
 }