From 451fd90d924b6fd4e6f208952b525cab2029cd6d Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Wed, 3 Oct 2012 17:14:48 +0000 Subject: Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we do consistent logging and error-checking at all these sites. BUG=none TEST=none Review URL: https://codereview.chromium.org/11050009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159908 0039d316-1c4b-4281-b951-d872f2087c98 --- net/url_request/url_request_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index d38c527..67779a0 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -64,6 +64,7 @@ #include "testing/platform_test.h" #if defined(OS_WIN) +#include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" #endif @@ -702,7 +703,7 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { std::wstring lnk_path = app_path.value() + L".lnk"; - CoInitialize(NULL); + base::win::ScopedCOMInitializer com_initializer; // Temporarily create a shortcut for test IShellLink* shell = NULL; @@ -751,7 +752,6 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { // Clean the shortcut DeleteFile(lnk_path.c_str()); - CoUninitialize(); } #endif // defined(OS_WIN) -- cgit v1.1