Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 46 matching lines @@
 #include "net/url_request/url_request_file_dir_job.h"
 #include "net/url_request/url_request_http_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_redirect_job.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 #if defined(OS_WIN)
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/windows_version.h"
 #endif
 
 using base::Time;
 
 namespace net {
 
 namespace {
 
 const string16 kChrome(ASCIIToUTF16("chrome"));
@@ skipping 618 matching lines @@
 TEST_F(URLRequestTest, ResolveShortcutTest) {
   FilePath app_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &app_path);
   app_path = app_path.AppendASCII("net");
   app_path = app_path.AppendASCII("data");
   app_path = app_path.AppendASCII("url_request_unittest");
   app_path = app_path.AppendASCII("with-headers.html");
 
   std::wstring lnk_path = app_path.value() + L".lnk";
 
-  CoInitialize(NULL);
+  base::win::ScopedCOMInitializer com_initializer_;

[Ryan Sleevi, 2012/10/03 12:50:43]

nit: naming

 
   // 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())));
@@ skipping 28 matching lines @@
     std::string content(buffer.get(), read_size);
     CloseHandle(file);
 
     EXPECT_TRUE(!r.is_pending());
     EXPECT_EQ(1, d.received_redirect_count());
     EXPECT_EQ(content, d.data_received());
   }
 
   // Clean the shortcut
   DeleteFile(lnk_path.c_str());
-  CoUninitialize();
 }
 #endif  // defined(OS_WIN)
 
 TEST_F(URLRequestTest, FileDirCancelTest) {
   // Put in mock resource provider.
   NetModule::SetResourceProvider(TestNetResourceProvider);
 
   TestDelegate d;
   {
     FilePath file_path;
@@ skipping 4068 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net