[Extensions] Update some extensions browser tests to use manifest v2

Some extension browser tests generate extension objects at runtime.
Update these to generate extensions with manifest_version: 2. Where it
wasn't already used, also update these to use ExtensionBuilder, which
uses manifest v2 by default.

Bug: 816679
Bug: 756488
Change-Id: I7142d085ad9569dccd4e9b62e09c7a68da08e360
Reviewed-on: https://chromium-review.googlesource.com/1008633Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550113}

chrome/browser/extensions/api/sessions/sessions_apitest.cc

@@ -34,6 +34,7 @@
 #include "components/sync/model/sync_error_factory_mock.h"
 #include "components/sync_sessions/sessions_sync_manager.h"
 #include "extensions/browser/api_test_utils.h"
+#include "extensions/common/extension_builder.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
@@ -240,11 +241,10 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {
 }
 
 void ExtensionSessionsTest::CreateTestExtension() {
-  std::unique_ptr<base::DictionaryValue> test_extension_value(
-      api_test_utils::ParseDictionary(
-          "{\"name\": \"Test\", \"version\": \"1.0\", "
-          "\"permissions\": [\"sessions\", \"tabs\"]}"));
-  extension_ = api_test_utils::CreateExtension(test_extension_value.get());
+  extension_ = ExtensionBuilder("Test")
+                   .AddPermissions({"sessions", "tabs"})
+                   .SetLocation(Manifest::INTERNAL)
+                   .Build();
 }
 
 void ExtensionSessionsTest::CreateSessionModels() {

chrome/browser/extensions/extension_install_prompt_browsertest.cc

@@ -16,19 +16,13 @@
 #include "extensions/browser/extension_dialog_auto_confirm.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
-#include "extensions/common/value_builder.h"
 
 using extensions::ScopedTestDialogAutoConfirm;
 
 namespace {
 
 scoped_refptr<extensions::Extension> BuildTestExtension() {
-  return extensions::ExtensionBuilder()
-      .SetManifest(extensions::DictionaryBuilder()
-                       .Set("name", "foo")
-                       .Set("version", "1.0")
-                       .Build())
-      .Build();
+  return extensions::ExtensionBuilder("foo").Build();
 }
 
 }  // namespace

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc

@@ -36,12 +36,7 @@ const char kReferrerId[] = "chrome-remove-extension-dialog";
 const char kUninstallUrlPrefKey[] = "uninstall_url";
 
 scoped_refptr<extensions::Extension> BuildTestExtension() {
-  return extensions::ExtensionBuilder()
-      .SetManifest(extensions::DictionaryBuilder()
-                       .Set("name", "foo")
-                       .Set("version", "1.0")
-                       .Build())
-      .Build();
+  return extensions::ExtensionBuilder("foo").Build();
 }
 
 std::string GetActiveUrl(Browser* browser) {
@@ -311,16 +306,15 @@ class ExtensionUninstallDialogViewInteractiveBrowserTest
     EXTENSION_FROM_WEBSTORE,
   };
   void ShowUi(const std::string& name) override {
-    extensions::DictionaryBuilder manifest_builder;
-    manifest_builder.Set("name", "ExtensionForRemoval").Set("version", "1.0");
+    extensions::ExtensionBuilder extension_builder("ExtensionForRemoval");
     if (extension_origin_ == EXTENSION_FROM_WEBSTORE) {
-      manifest_builder.Set("update_url",
-                           extension_urls::GetWebstoreUpdateUrl().spec());
+      extensions::DictionaryBuilder update_url;
+      update_url.Set("update_url",
+                     extension_urls::GetWebstoreUpdateUrl().spec());
+      extension_builder.MergeManifest(update_url.Build());
     }
 
-    extension_ = extensions::ExtensionBuilder()
-                     .SetManifest(manifest_builder.Build())
-                     .Build();
+    extension_ = extension_builder.Build();
     extensions::ExtensionSystem::Get(browser()->profile())
         ->extension_service()
         ->AddExtension(extension_.get());
@@ -330,12 +324,7 @@ class ExtensionUninstallDialogViewInteractiveBrowserTest
         &delegate_));
     if (uninstall_method_ == UNINSTALL_BY_EXTENSION) {
       triggering_extension_ =
-          extensions::ExtensionBuilder()
-              .SetManifest(extensions::DictionaryBuilder()
-                               .Set("name", "TestExtensionRemover")
-                               .Set("version", "1.0")
-                               .Build())
-              .Build();
+          extensions::ExtensionBuilder("TestExtensionRemover").Build();
       dialog_->ConfirmUninstallByExtension(
           extension_.get(), triggering_extension_.get(),
           extensions::UNINSTALL_REASON_FOR_TESTING,