c/browser, c/common, components S-W: Change ScopedTempDir::path() to GetPath()

chrome/browser/shell_integration_win_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 "chrome/browser/shell_integration_win.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 27 matching lines @@
 };
 
 class ShellIntegrationWinMigrateShortcutTest : public testing::Test {
  protected:
   ShellIntegrationWinMigrateShortcutTest() {}
 
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // A path to a random target.
-    base::CreateTemporaryFileInDir(temp_dir_.path(), &other_target_);
+    base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &other_target_);
 
     // This doesn't need to actually have a base name of "chrome.exe".
-    base::CreateTemporaryFileInDir(temp_dir_.path(), &chrome_exe_);
+    base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &chrome_exe_);
 
     chrome_app_id_ =
         ShellUtil::GetBrowserModelId(BrowserDistribution::GetDistribution(),
                                      true);
 
     base::FilePath default_user_data_dir;
     chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
     base::FilePath default_profile_path =
         default_user_data_dir.AppendASCII(chrome::kInitialProfile);
     non_default_user_data_dir_ = base::FilePath(FILE_PATH_LITERAL("root"))
@@ skipping 17 matching lines @@
 
     CreateShortcuts();
   }
 
   // Creates a test shortcut corresponding to |shortcut_properties| and resets
   // |shortcut_properties| after copying it to an internal structure for later
   // verification.
   void AddTestShortcutAndResetProperties(
       base::win::ShortcutProperties* shortcut_properties) {
     ShortcutTestObject shortcut_test_object;
-    base::FilePath shortcut_path =
-        temp_dir_.path().Append(L"Shortcut " +
-                                base::IntToString16(shortcuts_.size()) +
-                                installer::kLnkExt);
+    base::FilePath shortcut_path = temp_dir_.GetPath().Append(
+        L"Shortcut " + base::IntToString16(shortcuts_.size()) +
+        installer::kLnkExt);
     shortcut_test_object.path = shortcut_path;
     shortcut_test_object.properties = *shortcut_properties;
     shortcuts_.push_back(shortcut_test_object);
     ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
         shortcut_path, *shortcut_properties,
         base::win::SHORTCUT_CREATE_ALWAYS));
     shortcut_properties->options = 0U;
   }
 
   void CreateShortcuts() {
@@ skipping 155 matching lines @@
 };
 
 }  // namespace
 
 TEST_F(ShellIntegrationWinMigrateShortcutTest, ClearDualModeAndAdjustAppIds) {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   // 9 shortcuts should have their app id updated below and shortcut 11 should
   // be migrated away from dual_mode for a total of 10 shortcuts migrated.
-  EXPECT_EQ(10, MigrateShortcutsInPathInternal(chrome_exe_, temp_dir_.path()));
+  EXPECT_EQ(10,
+            MigrateShortcutsInPathInternal(chrome_exe_, temp_dir_.GetPath()));
 
   // Shortcut 1, 3, 4, 5, 6, 7, 8, 9, and 10 should have had their app_id fixed.
   shortcuts_[1].properties.set_app_id(chrome_app_id_);
   shortcuts_[3].properties.set_app_id(chrome_app_id_);
   shortcuts_[4].properties.set_app_id(chrome_app_id_);
   shortcuts_[5].properties.set_app_id(chrome_app_id_);
   shortcuts_[6].properties.set_app_id(non_default_profile_chrome_app_id_);
   shortcuts_[7].properties.set_app_id(non_default_user_data_dir_chrome_app_id_);
   shortcuts_[8].properties.set_app_id(
       non_default_user_data_dir_and_profile_chrome_app_id_);
   shortcuts_[9].properties.set_app_id(extension_app_id_);
   shortcuts_[10].properties.set_app_id(non_default_profile_extension_app_id_);
 
   // No shortcut should still have the dual_mode property.
   for (size_t i = 0; i < shortcuts_.size(); ++i)
     shortcuts_[i].properties.set_dual_mode(false);
 
   for (size_t i = 0; i < shortcuts_.size(); ++i) {
     SCOPED_TRACE(i);
     base::win::ValidateShortcut(shortcuts_[i].path, shortcuts_[i].properties);
   }
 
   // Make sure shortcuts are not re-migrated.
-  EXPECT_EQ(0, MigrateShortcutsInPathInternal(chrome_exe_, temp_dir_.path()));
+  EXPECT_EQ(0,
+            MigrateShortcutsInPathInternal(chrome_exe_, temp_dir_.GetPath()));
 }
 
 TEST(ShellIntegrationWinTest, GetAppModelIdForProfileTest) {
   const base::string16 base_app_id(
       BrowserDistribution::GetDistribution()->GetBaseAppId());
 
   // Empty profile path should get chrome::kBrowserAppID
   base::FilePath empty_path;
   EXPECT_EQ(base_app_id, GetAppModelIdForProfile(base_app_id, empty_path));
 
   // Default profile path should get chrome::kBrowserAppID
   base::FilePath default_user_data_dir;
   chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
   base::FilePath default_profile_path =
       default_user_data_dir.AppendASCII(chrome::kInitialProfile);
   EXPECT_EQ(base_app_id,
             GetAppModelIdForProfile(base_app_id, default_profile_path));
 
   // Non-default profile path should get chrome::kBrowserAppID joined with
   // profile info.
   base::FilePath profile_path(FILE_PATH_LITERAL("root"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
   EXPECT_EQ(base_app_id + L".udd.UserDataTest",
             GetAppModelIdForProfile(base_app_id, profile_path));
 }
 
 }  // namespace win
 }  // namespace shell_integration