[Extensions] Update WebstoreInstallerTests to manifest v2

Update WebstoreInstallerTests to manifest v2 and remove the allowance for manifest v1 extensions. Repackage the crx used in the webstore_inline_install API tests to be updated to manifest v2. Bug: 816679 Change-Id: Id38616cf30c70d886542d5b4d8112c8831372863 Reviewed-on: https://chromium-review.googlesource.com/1017582 Reviewed-by: Karan Bhatia <karandeepb@chromium.org> Commit-Queue: Devlin <rdevlin.cronin@chromium.org> Cr-Commit-Position: refs/heads/master@{#551910}
marcosholgado · Apr 19, 2018 · 0eb8141 · 0eb8141
1 parent 77c104a
commit 0eb8141
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 8 deletions.
diff --git a/chrome/browser/extensions/webstore_installer_test.cc b/chrome/browser/extensions/webstore_installer_test.cc
@@ -54,10 +54,6 @@ WebstoreInstallerTest::WebstoreInstallerTest(
 
 WebstoreInstallerTest::~WebstoreInstallerTest() {}
 
-bool WebstoreInstallerTest::ShouldAllowLegacyExtensionManifests() {
-  return true;
-}
-
 void WebstoreInstallerTest::SetUpCommandLine(base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
 

diff --git a/chrome/browser/extensions/webstore_installer_test.h b/chrome/browser/extensions/webstore_installer_test.h
@@ -36,7 +36,6 @@ class WebstoreInstallerTest : public ExtensionBrowserTest {
                         const std::string& unverified_domain);
   ~WebstoreInstallerTest() override;
 
-  bool ShouldAllowLegacyExtensionManifests() override;
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
 

diff --git a/chrome/test/data/extensions/api_test/webstore_inline_install/extension.crx b/chrome/test/data/extensions/api_test/webstore_inline_install/extension.crx
diff --git a/...ns/api_test/webstore_inline_install/inlineinstall/detail/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa b/...ns/api_test/webstore_inline_install/inlineinstall/detail/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -3,5 +3,5 @@
   "users": "371,674",
   "average_rating": 4.36,
   "rating_count": 788,
-  "manifest": "{\"name\":\"Inline Install Test Extension\",\"version\":\"0.1\",\"icons\":{\"128\":\"icon.png\"},\"permissions\":[\"tabs\"]}"
+  "manifest": "{\"name\":\"Inline Install Test Extension\",\"version\":\"0.1\",\"manifest_version\":2,\"icons\":{\"128\":\"icon.png\"},\"permissions\":[\"tabs\"]}"
 }
diff --git a/...ns/api_test/webstore_inline_install/inlineinstall/detail/cccccccccccccccccccccccccccccccc b/...ns/api_test/webstore_inline_install/inlineinstall/detail/cccccccccccccccccccccccccccccccc
@@ -4,5 +4,5 @@
   "average_rating": 5,
   "rating_count": 0,
   "verified_site": "app.com",
-  "manifest": "{\"name\":\"Install Failure Test Extension\",\"version\":\"0.1\"}"
+  "manifest": "{\"name\":\"Install Failure Test Extension\",\"version\":\"0.1\",\"manifest_version\":2}"
 }
diff --git a/...ns/api_test/webstore_inline_install/inlineinstall/detail/ecglahbcnmdpdciemllbhojghbkagdje b/...ns/api_test/webstore_inline_install/inlineinstall/detail/ecglahbcnmdpdciemllbhojghbkagdje
@@ -4,5 +4,5 @@
   "average_rating": 4.36,
   "rating_count": 788,
   "verified_site": "app.com",
-  "manifest": "{\"name\":\"Inline Install Test Extension\",\"version\":\"0.1\",\"icons\":{\"128\":\"icon.png\"},\"permissions\":[\"tabs\"]}"
+  "manifest": "{\"name\":\"Inline Install Test Extension\",\"version\":\"0.1\",\"manifest_version\":2,\"icons\":{\"128\":\"icon.png\"},\"permissions\":[\"tabs\"]}"
 }