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

Unified Diff: chrome/test/chromedriver/chrome_launcher.cc

Issue 2321573002: //chrome misc: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Fix Win compilation 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/test/base/ui_test_utils.cc ('k') | chrome/test/chromedriver/chrome_launcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome_launcher.cc
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc
index ce2874bc6fcbba1d81a7be8c32eac355bf26c795..a876b525e50fc5087967333587fa92eaaf3aba6e 100644
--- a/chrome/test/chromedriver/chrome_launcher.cc
+++ b/chrome/test/chromedriver/chrome_launcher.cc
@@ -151,8 +151,8 @@ Status PrepareCommandLine(uint16_t port,
command.AppendArg("data:,");
if (!user_data_dir->CreateUniqueTempDir())
return Status(kUnknownError, "cannot create temp dir for user data dir");
- switches.SetSwitch("user-data-dir", user_data_dir->path().value());
- user_data_dir_path = user_data_dir->path();
+ switches.SetSwitch("user-data-dir", user_data_dir->GetPath().value());
+ user_data_dir_path = user_data_dir->GetPath();
}
Status status = internal::PrepareUserDataDir(user_data_dir_path,
@@ -166,10 +166,8 @@ Status PrepareCommandLine(uint16_t port,
"cannot create temp dir for unpacking extensions");
}
status = internal::ProcessExtensions(capabilities.extensions,
- extension_dir->path(),
- true,
- &switches,
- extension_bg_pages);
+ extension_dir->GetPath(), true,
+ &switches, extension_bg_pages);
if (status.IsError())
return status;
switches.AppendToCommandLine(&command);
@@ -675,7 +673,7 @@ Status ProcessExtension(const std::string& extension,
base::ScopedTempDir temp_crx_dir;
if (!temp_crx_dir.CreateUniqueTempDir())
return Status(kUnknownError, "cannot create temp dir");
- base::FilePath extension_crx = temp_crx_dir.path().AppendASCII("temp.crx");
+ base::FilePath extension_crx = temp_crx_dir.GetPath().AppendASCII("temp.crx");
int size = static_cast<int>(decoded_extension.length());
if (base::WriteFile(extension_crx, decoded_extension.c_str(), size) !=
size) {
« no previous file with comments | « chrome/test/base/ui_test_utils.cc ('k') | chrome/test/chromedriver/chrome_launcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698