Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: chrome/browser/shell_integration_win_unittest.cc

Issue 2321453002: c/browser, c/common, components S-W: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/shell_integration_linux_unittest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_win_unittest.cc
diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc
index e1f1d022235e73fadd4f242ae4cd211bfeefae96..4b1060ea5310ea7c1ae4a74a4b9dde25c856d175 100644
--- a/chrome/browser/shell_integration_win_unittest.cc
+++ b/chrome/browser/shell_integration_win_unittest.cc
@@ -45,10 +45,10 @@ class ShellIntegrationWinMigrateShortcutTest : public testing::Test {
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(),
@@ -86,10 +86,9 @@ class ShellIntegrationWinMigrateShortcutTest : public testing::Test {
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);
@@ -265,7 +264,8 @@ TEST_F(ShellIntegrationWinMigrateShortcutTest, ClearDualModeAndAdjustAppIds) {
// 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_);
@@ -289,7 +289,8 @@ TEST_F(ShellIntegrationWinMigrateShortcutTest, ClearDualModeAndAdjustAppIds) {
}
// 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) {
« no previous file with comments | « chrome/browser/shell_integration_linux_unittest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698