diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-13 01:20:56 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-13 01:20:56 +0000 |
| commit | aed9efbf3abe5c155e3bbdd4735f221add54ba40 (patch) | |
| tree | a473a5b2a2e2c3d3e1428a0bf3719e2a635dd44b /net | |
| parent | ef2ddd2b80066e94fec967dd3372e303af07134a (diff) | |
| download | chromium_src-aed9efbf3abe5c155e3bbdd4735f221add54ba40.zip chromium_src-aed9efbf3abe5c155e3bbdd4735f221add54ba40.tar.gz chromium_src-aed9efbf3abe5c155e3bbdd4735f221add54ba40.tar.bz2 | |
Use ScopedBstr, ScopedComPtr, and ScopedVariant in place of raw or ATL objects.
Also, use ScopedComPtr::CreateInstance() in place of CoCreateInstance().
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/13824005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 0d7c066..cf6fca4 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -72,6 +72,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" +#include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #endif @@ -824,20 +825,16 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { base::win::ScopedCOMInitializer com_initializer; // Temporarily create a shortcut for test - IShellLink* shell = NULL; - ASSERT_TRUE(SUCCEEDED(CoCreateInstance( - CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, - reinterpret_cast<LPVOID*>(&shell)))); - IPersistFile* persist = NULL; - ASSERT_TRUE(SUCCEEDED(shell->QueryInterface( - IID_IPersistFile, reinterpret_cast<LPVOID*>(&persist)))); - EXPECT_TRUE(SUCCEEDED(shell->SetPath(app_path.value().c_str()))); - EXPECT_TRUE(SUCCEEDED(shell->SetDescription(L"ResolveShortcutTest"))); - EXPECT_TRUE(SUCCEEDED(persist->Save(lnk_path.c_str(), TRUE))); - if (persist) - persist->Release(); - if (shell) - shell->Release(); + { + base::win::ScopedComPtr<IShellLink> shell; + ASSERT_TRUE(SUCCEEDED(shell.CreateInstance(CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER))); + base::win::ScopedComPtr<IPersistFile> persist; + ASSERT_TRUE(SUCCEEDED(shell.QueryInterface(persist.Receive()))); + EXPECT_TRUE(SUCCEEDED(shell->SetPath(app_path.value().c_str()))); + EXPECT_TRUE(SUCCEEDED(shell->SetDescription(L"ResolveShortcutTest"))); + EXPECT_TRUE(SUCCEEDED(persist->Save(lnk_path.c_str(), TRUE))); + } TestDelegate d; { |