From 8ee65baac4ab9e3beb67674adbc6a210e2708604 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 12 Apr 2011 20:53:23 +0000 Subject: 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 --- chrome/installer/util/shell_util_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/installer/util/shell_util_unittest.cc') diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc index b14007e..345c1e7 100644 --- a/chrome/installer/util/shell_util_unittest.cc +++ b/chrome/installer/util/shell_util_unittest.cc @@ -10,8 +10,8 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "base/scoped_comptr_win.h" #include "base/memory/scoped_temp_dir.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" @@ -22,8 +22,8 @@ bool VerifyChromeShortcut(const std::wstring& exe_path, const std::wstring& shortcut, const std::wstring& description, int icon_index) { - ScopedComPtr i_shell_link; - ScopedComPtr i_persist_file; + base::win::ScopedComPtr i_shell_link; + base::win::ScopedComPtr i_persist_file; // Get pointer to the IShellLink interface bool failed = FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL, -- cgit v1.1