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

base/win/shortcut_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 "base/win/shortcut.h"
 
-#include <windows.h>
-#include <objbase.h>
-
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_shortcut_win.h"
+#include "base/win/scoped_com_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 static const char kFileContents[] = "This is a target.";
 static const char kFileContents2[] = "This is another target.";
 
 class ShortcutTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_dir_2_.CreateUniqueTempDir());
 
-    EXPECT_EQ(S_OK, CoInitialize(NULL));
-
     link_file_ = temp_dir_.path().Append(L"My Link.lnk");
 
     // Shortcut 1's properties
     {
       const FilePath target_file(temp_dir_.path().Append(L"Target 1.txt"));
       file_util::WriteFile(target_file, kFileContents,
                            arraysize(kFileContents));
 
       link_properties_.set_target(target_file);
       link_properties_.set_working_dir(temp_dir_.path());
@@ skipping 16 matching lines @@
       link_properties_2_.set_target(target_file_2);
       link_properties_2_.set_working_dir(temp_dir_2_.path());
       link_properties_2_.set_arguments(L"--super --crazy");
       link_properties_2_.set_description(L"The best in the west.");
       link_properties_2_.set_icon(icon_path_2, 0);
       link_properties_2_.set_app_id(L"Chrome.UserLevelCrazySuffix");
       link_properties_2_.set_dual_mode(true);
     }
   }
 
-  virtual void TearDown() OVERRIDE {
-    CoUninitialize();
-  }
-
+  base::win::ScopedCOMInitializer com_initializer_;
   ScopedTempDir temp_dir_;
   ScopedTempDir temp_dir_2_;
 
   // The link file to be created/updated in the shortcut tests below.
   FilePath link_file_;
 
   // Properties for the created shortcut.
   base::win::ShortcutProperties link_properties_;
 
   // Properties for the updated shortcut.
@@ skipping 166 matching lines @@
   expected_properties.set_app_id(string16());
   expected_properties.set_dual_mode(false);
   base::win::ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, FailTruncateShortcutThatDoesNotExist) {
   ASSERT_FALSE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_REPLACE_EXISTING));
   ASSERT_FALSE(file_util::PathExists(link_file_));
 }