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

Unified Diff: chrome/browser/extensions/extension_keybinding_apitest.cc

Issue 2314363002: extensions: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Comment addressed 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
Index: chrome/browser/extensions/extension_keybinding_apitest.cc
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index d9d04bc3ca175a2329d04d715ec3d36bda86870b..be19bc2a2eff4cae21bae0527b3853f5e68d4803 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -563,17 +563,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutAddedOnUpdate) {
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
base::FilePath path_v1_unassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1_unassigned"),
- scoped_temp_dir.path().AppendASCII("v1_unassigned.crx"),
- pem_path,
- base::FilePath());
- base::FilePath path_v2 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2"),
- scoped_temp_dir.path().AppendASCII("v2.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1_unassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
base::FilePath());
+ base::FilePath path_v2 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2"),
+ scoped_temp_dir.GetPath().AppendASCII("v2.crx"),
+ pem_path, base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
CommandService* command_service = CommandService::Get(browser()->profile());
@@ -607,17 +607,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutChangedOnUpdate) {
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
- base::FilePath path_v1 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1"),
- scoped_temp_dir.path().AppendASCII("v1.crx"),
- pem_path,
- base::FilePath());
+ base::FilePath path_v1 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1"),
+ scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+ pem_path, base::FilePath());
base::FilePath path_v2_reassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2_reassigned"),
- scoped_temp_dir.path().AppendASCII("v2_reassigned.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2_reassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v2_reassigned.crx"), pem_path,
base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
@@ -655,17 +655,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutRemovedOnUpdate) {
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
- base::FilePath path_v1 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1"),
- scoped_temp_dir.path().AppendASCII("v1.crx"),
- pem_path,
- base::FilePath());
+ base::FilePath path_v1 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1"),
+ scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+ pem_path, base::FilePath());
base::FilePath path_v2_unassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2_unassigned"),
- scoped_temp_dir.path().AppendASCII("v2_unassigned.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2_unassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v2_unassigned.crx"), pem_path,
base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
@@ -702,17 +702,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest,
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
base::FilePath path_v1_unassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1_unassigned"),
- scoped_temp_dir.path().AppendASCII("v1_unassigned.crx"),
- pem_path,
- base::FilePath());
- base::FilePath path_v2 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2"),
- scoped_temp_dir.path().AppendASCII("v2.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1_unassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
base::FilePath());
+ base::FilePath path_v2 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2"),
+ scoped_temp_dir.GetPath().AppendASCII("v2.crx"),
+ pem_path, base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
CommandService* command_service = CommandService::Get(browser()->profile());
@@ -751,17 +751,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest,
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
- base::FilePath path_v1 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1"),
- scoped_temp_dir.path().AppendASCII("v1.crx"),
- pem_path,
- base::FilePath());
+ base::FilePath path_v1 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1"),
+ scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+ pem_path, base::FilePath());
base::FilePath path_v2_reassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2_reassigned"),
- scoped_temp_dir.path().AppendASCII("v2_reassigned.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2_reassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v2_reassigned.crx"), pem_path,
base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
@@ -806,16 +806,16 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest,
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
base::FilePath path_v1 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("mk_v1"),
- scoped_temp_dir.path().AppendASCII("mk_v1.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("mk_v1"),
+ scoped_temp_dir.GetPath().AppendASCII("mk_v1.crx"), pem_path,
base::FilePath());
base::FilePath path_v2_reassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("mk_v2"),
- scoped_temp_dir.path().AppendASCII("mk_v2.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("mk_v2"),
+ scoped_temp_dir.GetPath().AppendASCII("mk_v2.crx"), pem_path,
base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
@@ -858,17 +858,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest,
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
AppendASCII("keybinding").AppendASCII("keybinding.pem");
- base::FilePath path_v1 = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v1"),
- scoped_temp_dir.path().AppendASCII("v1.crx"),
- pem_path,
- base::FilePath());
+ base::FilePath path_v1 =
+ PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v1"),
+ scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+ pem_path, base::FilePath());
base::FilePath path_v2_unassigned = PackExtensionWithOptions(
- test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
- .AppendASCII("v2_unassigned"),
- scoped_temp_dir.path().AppendASCII("v2_unassigned.crx"),
- pem_path,
+ test_data_dir_.AppendASCII("keybinding")
+ .AppendASCII("update")
+ .AppendASCII("v2_unassigned"),
+ scoped_temp_dir.GetPath().AppendASCII("v2_unassigned.crx"), pem_path,
base::FilePath());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());

Powered by Google App Engine
This is Rietveld 408576698