Revert "Re-land "Support multiple shells in a single process. (#4932)" (

#4977)"

This reverts commit a3327bf.

BUILD.gn

@@ -10,12 +10,14 @@ group("flutter") {
   public_deps = [
     "$flutter_root/lib/snapshot:generate_snapshot_bin",
     "$flutter_root/lib/snapshot:kernel_platform_files",
-    "$flutter_root/shell/testing",
     "$flutter_root/sky",
+    "$flutter_root/third_party/txt",
   ]
 
   if (flutter_runtime_mode != "debug") {
-    public_deps += [ "$flutter_root/lib/snapshot:entry_points_json_files" ]
+    public_deps += [
+      "$flutter_root/lib/snapshot:entry_points_json_files",
+    ]
   }
 
   if (!is_fuchsia && !is_fuchsia_host) {
@@ -43,24 +45,20 @@ group("flutter") {
         "$flutter_root/shell/platform/embedder:flutter_embedder_framework",
       ]
     }
-
+    if (!is_win) {
+      public_deps += [
+        "$flutter_root/shell/platform/embedder:embedder_unittests",
+        "$flutter_root/shell/platform/embedder:flutter_engine",
+      ]
+    }
     public_deps += [
       "$flutter_root/flow:flow_unittests",
       "$flutter_root/fml:fml_unittests",
-      "$flutter_root/runtime:runtime_unittests",
-      "$flutter_root/shell/common:shell_unittests",
       "$flutter_root/sky/engine/wtf:wtf_unittests",
       "$flutter_root/synchronization:synchronization_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
       "//garnet/public/lib/fxl:fxl_unittests",
     ]
-
-    if (!is_win) {
-      public_deps += [
-        "$flutter_root/shell/platform/embedder:embedder_unittests",
-        "$flutter_root/shell/platform/embedder:flutter_engine",
-      ]
-    }
   }
 }
 
@@ -76,47 +74,59 @@ if (is_fuchsia) {
       "$flutter_root/content_handler:aot",
     ]
     if (flutter_runtime_mode != "release") {
-      deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
+      deps += [
+        "//third_party/dart/runtime/observatory:embedded_archive_observatory",
+      ]
     }
 
     binary = "flutter_aot_runner"
 
     if (flutter_runtime_mode != "release") {
-      resources = [ {
-            path = rebase_path(
-                    "$root_gen_dir/observatory/embedded_archive_observatory.tar")
-            dest = "observatory.tar"
-          } ]
+      resources = [
+        {
+          path = rebase_path(
+                  "$root_gen_dir/observatory/embedded_archive_observatory.tar")
+          dest = "observatory.tar"
+        },
+      ]
     }
 
-    meta = [ {
-          path = rebase_path("content_handler/meta/sandbox")
-          dest = "sandbox"
-        } ]
+    meta = [
+      {
+        path = rebase_path("content_handler/meta/sandbox")
+        dest = "sandbox"
+      },
+    ]
   }
 
   package("flutter_jit_runner") {
     deps = [
       "$flutter_root/content_handler:jit",
     ]
     if (flutter_runtime_mode != "release") {
-      deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
+      deps += [
+        "//third_party/dart/runtime/observatory:embedded_archive_observatory",
+      ]
     }
 
     binary = "flutter_jit_runner"
 
     if (flutter_runtime_mode != "release") {
-      resources = [ {
-            path = rebase_path(
-                    "$root_gen_dir/observatory/embedded_archive_observatory.tar")
-            dest = "observatory.tar"
-          } ]
+      resources = [
+        {
+          path = rebase_path(
+                  "$root_gen_dir/observatory/embedded_archive_observatory.tar")
+          dest = "observatory.tar"
+        },
+      ]
     }
 
-    meta = [ {
-          path = rebase_path("content_handler/meta/sandbox")
-          dest = "sandbox"
-        } ]
+    meta = [
+      {
+        path = rebase_path("content_handler/meta/sandbox")
+        dest = "sandbox"
+      },
+    ]
   }
 } else {
   group("dist") {

DEPS

@@ -115,7 +115,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '3cf97e01cdbd4bb920fa3d40282a56c4b2d62a58',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8dddd90bf943a8174913564353b30a3b11ee0f7a',
 
    # Fuchsia compatibility
    #

assets/BUILD.gn

@@ -4,18 +4,16 @@
 
 source_set("assets") {
   sources = [
-    "asset_manager.cc",
-    "asset_manager.h",
-    "asset_resolver.h",
+    "asset_provider.h",
     "directory_asset_bundle.cc",
     "directory_asset_bundle.h",
+    "unzipper_provider.cc",
+    "unzipper_provider.h",
     "zip_asset_store.cc",
     "zip_asset_store.h",
   ]
 
   deps = [
-    "$flutter_root/common",
-    "$flutter_root/fml",
     "$flutter_root/glue",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/zip",
@@ -25,5 +23,7 @@ source_set("assets") {
     "//third_party/zlib:minizip",
   ]
 
-  public_configs = [ "$flutter_root:config" ]
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }

assets/asset_provider.h

@@ -0,0 +1,25 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_ASSETS_ASSET_PROVIDER_H_
+#define FLUTTER_ASSETS_ASSET_PROVIDER_H_
+
+#include <string>
+#include <vector>
+
+#include "lib/fxl/memory/ref_counted.h"
+
+namespace blink {
+
+class AssetProvider
+    : public fxl::RefCountedThreadSafe<AssetProvider>
+    {
+ public:
+  virtual bool GetAsBuffer(const std::string& asset_name,
+                           std::vector<uint8_t>* data) = 0;
+  virtual ~AssetProvider() = default;
+};
+
+}  // namespace blink
+#endif // FLUTTER_ASSETS_ASSET_PROVIDER_H