Fix more remaining FilePath -> base::FilePath.

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 <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/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 base {
+namespace win {
+
 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());
@@ skipping 27 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);
     }
   }
 
-  base::win::ScopedCOMInitializer com_initializer_;
-  base::ScopedTempDir temp_dir_;
-  base::ScopedTempDir temp_dir_2_;
+  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_;
+  ShortcutProperties link_properties_;
 
   // Properties for the updated shortcut.
-  base::win::ShortcutProperties link_properties_2_;
+  ShortcutProperties link_properties_2_;
 };
 
 }  // namespace
 
 TEST_F(ShortcutTest, CreateAndResolveShortcut) {
-  base::win::ShortcutProperties only_target_properties;
+  ShortcutProperties only_target_properties;
   only_target_properties.set_target(link_properties_.target);
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, only_target_properties, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, only_target_properties, SHORTCUT_CREATE_ALWAYS));
 
   FilePath resolved_name;
-  EXPECT_TRUE(base::win::ResolveShortcut(link_file_, &resolved_name, NULL));
+  EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, NULL));
 
   char read_contents[arraysize(kFileContents)];
   file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents, read_contents);
 }
 
 TEST_F(ShortcutTest, ResolveShortcutWithArgs) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
   FilePath resolved_name;
   string16 args;
-  EXPECT_TRUE(base::win::ResolveShortcut(link_file_, &resolved_name, &args));
+  EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, &args));
 
   char read_contents[arraysize(kFileContents)];
   file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents, read_contents);
   EXPECT_EQ(link_properties_.arguments, args);
 }
 
 TEST_F(ShortcutTest, CreateShortcutWithOnlySomeProperties) {
-  base::win::ShortcutProperties target_and_args_properties;
+  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(
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, target_and_args_properties,
-      base::win::SHORTCUT_CREATE_ALWAYS));
+      SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ValidateShortcut(link_file_, target_and_args_properties);
+  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_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ValidateShortcut(link_file_, link_properties_);
+  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(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_2_, base::win::SHORTCUT_UPDATE_EXISTING));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_2_, SHORTCUT_UPDATE_EXISTING));
 
-  base::win::ValidateShortcut(link_file_, link_properties_2_);
+  ValidateShortcut(link_file_, link_properties_2_);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutUpdateOnlyTargetAndResolve) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ShortcutProperties update_only_target_properties;
+  ShortcutProperties update_only_target_properties;
   update_only_target_properties.set_target(link_properties_2_.target);
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, update_only_target_properties,
-      base::win::SHORTCUT_UPDATE_EXISTING));
+      SHORTCUT_UPDATE_EXISTING));
 
-  base::win::ShortcutProperties expected_properties = link_properties_;
+  ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_target(link_properties_2_.target);
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 
   FilePath resolved_name;
-  EXPECT_TRUE(base::win::ResolveShortcut(link_file_, &resolved_name, NULL));
+  EXPECT_TRUE(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));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ShortcutProperties make_dual_mode_properties;
+  ShortcutProperties make_dual_mode_properties;
   make_dual_mode_properties.set_dual_mode(true);
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, make_dual_mode_properties,
-      base::win::SHORTCUT_UPDATE_EXISTING));
+      SHORTCUT_UPDATE_EXISTING));
 
-  base::win::ShortcutProperties expected_properties = link_properties_;
+  ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_dual_mode(true);
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutRemoveDualMode) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_2_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_2_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ShortcutProperties remove_dual_mode_properties;
+  ShortcutProperties remove_dual_mode_properties;
   remove_dual_mode_properties.set_dual_mode(false);
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, remove_dual_mode_properties,
-      base::win::SHORTCUT_UPDATE_EXISTING));
+      SHORTCUT_UPDATE_EXISTING));
 
-  base::win::ShortcutProperties expected_properties = link_properties_2_;
+  ShortcutProperties expected_properties = link_properties_2_;
   expected_properties.set_dual_mode(false);
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutClearArguments) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ShortcutProperties clear_arguments_properties;
+  ShortcutProperties clear_arguments_properties;
   clear_arguments_properties.set_arguments(string16());
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, clear_arguments_properties,
-      base::win::SHORTCUT_UPDATE_EXISTING));
+      SHORTCUT_UPDATE_EXISTING));
 
-  base::win::ShortcutProperties expected_properties = link_properties_;
+  ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_arguments(string16());
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, FailUpdateShortcutThatDoesNotExist) {
-  ASSERT_FALSE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_UPDATE_EXISTING));
+  ASSERT_FALSE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_UPDATE_EXISTING));
   ASSERT_FALSE(file_util::PathExists(link_file_));
 }
 
 TEST_F(ShortcutTest, ReplaceShortcutAllProperties) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_2_, base::win::SHORTCUT_REPLACE_EXISTING));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_2_, SHORTCUT_REPLACE_EXISTING));
 
-  base::win::ValidateShortcut(link_file_, link_properties_2_);
+  ValidateShortcut(link_file_, link_properties_2_);
 }
 
 TEST_F(ShortcutTest, ReplaceShortcutSomeProperties) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
-  base::win::ShortcutProperties new_properties;
+  ShortcutProperties new_properties;
   new_properties.set_target(link_properties_2_.target);
   new_properties.set_arguments(link_properties_2_.arguments);
   new_properties.set_description(link_properties_2_.description);
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, new_properties, base::win::SHORTCUT_REPLACE_EXISTING));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, new_properties, SHORTCUT_REPLACE_EXISTING));
 
   // Expect only properties in |new_properties| to be set, all other properties
   // should have been overwritten.
-  base::win::ShortcutProperties expected_properties(new_properties);
+  ShortcutProperties expected_properties(new_properties);
   expected_properties.set_working_dir(FilePath());
   expected_properties.set_icon(FilePath(), 0);
   expected_properties.set_app_id(string16());
   expected_properties.set_dual_mode(false);
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 }
 
 TEST_F(ShortcutTest, FailReplaceShortcutThatDoesNotExist) {
-  ASSERT_FALSE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_REPLACE_EXISTING));
+  ASSERT_FALSE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_REPLACE_EXISTING));
   ASSERT_FALSE(file_util::PathExists(link_file_));
 }
 
 // Test that the old arguments remain on the replaced shortcut when not
 // otherwise specified.
 TEST_F(ShortcutTest, ReplaceShortcutKeepOldArguments) {
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_, base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
   // Do not explicitly set the arguments.
   link_properties_2_.options &=
-      ~base::win::ShortcutProperties::PROPERTIES_ARGUMENTS;
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-      link_file_, link_properties_2_, base::win::SHORTCUT_REPLACE_EXISTING));
+      ~ShortcutProperties::PROPERTIES_ARGUMENTS;
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      link_file_, link_properties_2_, SHORTCUT_REPLACE_EXISTING));
 
-  base::win::ShortcutProperties expected_properties(link_properties_2_);
+  ShortcutProperties expected_properties(link_properties_2_);
   expected_properties.set_arguments(link_properties_.arguments);
-  base::win::ValidateShortcut(link_file_, expected_properties);
+  ValidateShortcut(link_file_, expected_properties);
 }
+
+}  // namespace win
+}  // namespace base