Use gtest failures and EXPECTS instead of returning a failure enum in test target base/test/test_sh…

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>
@@ skipping 104 matching lines @@
 
 TEST_F(ShortcutTest, CreateShortcutWithOnlySomeProperties) {
   base::win::ShortcutProperties target_and_args_properties;
   target_and_args_properties.set_target(link_properties_.target);
   target_and_args_properties.set_arguments(link_properties_.arguments);
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, target_and_args_properties,
       base::win::SHORTCUT_CREATE_ALWAYS));
 
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, target_and_args_properties));
+  base::win::ValidateShortcut(link_file_, target_and_args_properties);
 }
 
 TEST_F(ShortcutTest, CreateShortcutVerifyProperties) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
 
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, link_properties_));
+  base::win::ValidateShortcut(link_file_, link_properties_);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutVerifyProperties) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_2_, base::win::SHORTCUT_UPDATE_EXISTING));
 
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, link_properties_2_));
+  base::win::ValidateShortcut(link_file_, link_properties_2_);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutUpdateOnlyTargetAndResolve) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
 
   base::win::ShortcutProperties update_only_target_properties;
   update_only_target_properties.set_target(link_properties_2_.target);
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, update_only_target_properties,
       base::win::SHORTCUT_UPDATE_EXISTING));
 
   base::win::ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_target(link_properties_2_.target);
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, expected_properties));
+  base::win::ValidateShortcut(link_file_, expected_properties);
 
   FilePath resolved_name;
   EXPECT_TRUE(base::win::ResolveShortcut(link_file_, &resolved_name, NULL));
 
   char read_contents[arraysize(kFileContents2)];
   file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents2, read_contents);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutMakeDualMode) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
 
   base::win::ShortcutProperties make_dual_mode_properties;
   make_dual_mode_properties.set_dual_mode(true);
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, make_dual_mode_properties,
       base::win::SHORTCUT_UPDATE_EXISTING));
 
   base::win::ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_dual_mode(true);
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, expected_properties));
+  base::win::ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutRemoveDualMode) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_2_, base::win::SHORTCUT_CREATE_ALWAYS));
 
   base::win::ShortcutProperties remove_dual_mode_properties;
   remove_dual_mode_properties.set_dual_mode(false);
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, remove_dual_mode_properties,
       base::win::SHORTCUT_UPDATE_EXISTING));
 
   base::win::ShortcutProperties expected_properties = link_properties_2_;
   expected_properties.set_dual_mode(false);
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, expected_properties));
+  base::win::ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutClearArguments) {
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
 
   base::win::ShortcutProperties clear_arguments_properties;
   clear_arguments_properties.set_arguments(string16());
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
       link_file_, clear_arguments_properties,
       base::win::SHORTCUT_UPDATE_EXISTING));
 
   base::win::ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_arguments(string16());
-  ASSERT_EQ(base::win::VERIFY_SHORTCUT_SUCCESS,
-            base::win::VerifyShortcut(link_file_, expected_properties));
+  base::win::ValidateShortcut(link_file_, expected_properties);
 }