[Extensions] Update IdentityTestWithSignin to manifest v2

Update IdentityTestWithSignin to manifest v2 and remove the allowance
for manifest v1 extensions.

Bug: 816679

Change-Id: I0312986394cf10c58f31884284f7830df947feea
Reviewed-on: https://chromium-review.googlesource.com/1014600Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551804}

chrome/browser/extensions/api/identity/identity_apitest.cc

@@ -454,8 +454,6 @@ class IdentityTestWithSignin : public AsyncExtensionBrowserTest {
         Profile::FromBrowserContext(context));
   }
 
-  bool ShouldAllowLegacyExtensionManifests() override { return true; }
-
   void SetUpOnMainThread() override {
     AsyncExtensionBrowserTest::SetUpOnMainThread();
 
@@ -671,11 +669,7 @@ class IdentityGetProfileUserInfoFunctionTest : public IdentityTestWithSignin {
 
  private:
   scoped_refptr<Extension> CreateExtensionWithEmailPermission() {
-    std::unique_ptr<base::DictionaryValue> test_extension_value(
-        api_test_utils::ParseDictionary(
-            "{\"name\": \"Test\", \"version\": \"1.0\", "
-            "\"permissions\": [\"identity.email\"]}"));
-    return api_test_utils::CreateExtension(test_extension_value.get());
+    return ExtensionBuilder("Test").AddPermission("identity.email").Build();
   }
 };
 
@@ -1964,18 +1958,15 @@ class GetAuthTokenFunctionPublicSessionTest : public GetAuthTokenFunctionTest {
   }
 
   scoped_refptr<Extension> CreateTestExtension(const std::string& id) {
-    return ExtensionBuilder()
-        .SetManifest(
+    return ExtensionBuilder("Test")
+        .MergeManifest(
             DictionaryBuilder()
-                .Set("name", "Test")
-                .Set("version", "1.0")
                 .Set("oauth2",
                      DictionaryBuilder()
                          .Set("client_id", "clientId")
                          .Set("scopes", ListBuilder().Append("scope1").Build())
                          .Build())
                 .Build())
-        .SetLocation(Manifest::UNPACKED)
         .SetID(id)
         .Build();
   }