| Index: chrome/browser/extensions/content_script_apitest.cc
|
| diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
|
| index 4615de0ac247ce6edd891f1b8a49fd136b1bdaa5..ac0e89ba7f7d1b512ba6be9a57f8edc8dd54d154 100644
|
| --- a/chrome/browser/extensions/content_script_apitest.cc
|
| +++ b/chrome/browser/extensions/content_script_apitest.cc
|
| @@ -454,13 +454,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBlockingScript) {
|
| ext_dir1.WriteManifest(
|
| base::StringPrintf(kManifest, "ext1", "document_start"));
|
| ext_dir1.WriteFile(FILE_PATH_LITERAL("script.js"), kBlockingScript);
|
| - const Extension* ext1 = LoadExtension(ext_dir1.unpacked_path());
|
| + const Extension* ext1 = LoadExtension(ext_dir1.UnpackedPath());
|
| ASSERT_TRUE(ext1);
|
|
|
| TestExtensionDir ext_dir2;
|
| ext_dir2.WriteManifest(base::StringPrintf(kManifest, "ext2", "document_end"));
|
| ext_dir2.WriteFile(FILE_PATH_LITERAL("script.js"), kNonBlockingScript);
|
| - const Extension* ext2 = LoadExtension(ext_dir2.unpacked_path());
|
| + const Extension* ext2 = LoadExtension(ext_dir2.UnpackedPath());
|
| ASSERT_TRUE(ext2);
|
|
|
| content::WebContents* web_contents =
|
| @@ -506,13 +506,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBlockingScriptTabClosed) {
|
| ext_dir1.WriteManifest(
|
| base::StringPrintf(kManifest, "ext1", "document_start"));
|
| ext_dir1.WriteFile(FILE_PATH_LITERAL("script.js"), kBlockingScript);
|
| - const Extension* ext1 = LoadExtension(ext_dir1.unpacked_path());
|
| + const Extension* ext1 = LoadExtension(ext_dir1.UnpackedPath());
|
| ASSERT_TRUE(ext1);
|
|
|
| TestExtensionDir ext_dir2;
|
| ext_dir2.WriteManifest(base::StringPrintf(kManifest, "ext2", "document_end"));
|
| ext_dir2.WriteFile(FILE_PATH_LITERAL("script.js"), kNonBlockingScript);
|
| - const Extension* ext2 = LoadExtension(ext_dir2.unpacked_path());
|
| + const Extension* ext2 = LoadExtension(ext_dir2.UnpackedPath());
|
| ASSERT_TRUE(ext2);
|
|
|
| content::WebContents* web_contents =
|
| @@ -550,7 +550,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
|
| ext_dir1.WriteManifest(
|
| base::StringPrintf(kManifest, "ext1", "document_idle"));
|
| ext_dir1.WriteFile(FILE_PATH_LITERAL("script.js"), kBlockingScript);
|
| - const Extension* ext1 = LoadExtension(ext_dir1.unpacked_path());
|
| + const Extension* ext1 = LoadExtension(ext_dir1.UnpackedPath());
|
| ASSERT_TRUE(ext1);
|
|
|
| content::WebContents* web_contents =
|
| @@ -582,14 +582,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
|
| new_tab_override_dir.WriteManifest(kNewTabOverrideManifest);
|
| new_tab_override_dir.WriteFile(FILE_PATH_LITERAL("newtab.html"), kNewTabHtml);
|
| const Extension* new_tab_override =
|
| - LoadExtension(new_tab_override_dir.unpacked_path());
|
| + LoadExtension(new_tab_override_dir.UnpackedPath());
|
| ASSERT_TRUE(new_tab_override);
|
|
|
| TestExtensionDir injector_dir;
|
| injector_dir.WriteManifest(
|
| base::StringPrintf(kManifest, "injector", "document_start"));
|
| injector_dir.WriteFile(FILE_PATH_LITERAL("script.js"), kNonBlockingScript);
|
| - const Extension* injector = LoadExtension(injector_dir.unpacked_path());
|
| + const Extension* injector = LoadExtension(injector_dir.UnpackedPath());
|
| ASSERT_TRUE(injector);
|
|
|
| ExtensionTestMessageListener listener("done", false);
|
|
|