diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome/installer | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
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
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/shell_util_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<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, |