From 80ea45428887a9a0757bb5fa08050590ffccfa58 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 8 Jun 2020 12:33:31 -0700
Subject: [PATCH] [flutter_tools] change service worker load to NOTICES
 (#58890)

update flutter_service_worker.js to NOTICES
---
 .../flutter_tools/lib/src/build_system/targets/web.dart     | 6 +++---
 .../test/general.shard/build_system/targets/web_test.dart   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart
index 29dc0ca056c..b97a887c111 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/web.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart
@@ -378,7 +378,7 @@ class WebServiceWorker extends Target {
       '/',
       'main.dart.js',
       'index.html',
-      'assets/LICENSE',
+      'assets/NOTICES',
       if (urlToHash.containsKey('assets/AssetManifest.json'))
         'assets/AssetManifest.json',
       if (urlToHash.containsKey('assets/FontManifest.json'))
@@ -543,10 +543,10 @@ async function downloadOffline() {
   }
   for (var resourceKey in Object.keys(RESOURCES)) {
     if (!currentContent[resourceKey]) {
-      resources.add(resourceKey);
+      resources.push(resourceKey);
     }
   }
-  return Cache.addAll(resources);
+  return contentCache.addAll(resources);
 }
 ''';
 }
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
index d4611dc97cd..84d9490f598 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
@@ -488,7 +488,11 @@ void main() {
       contains('"a/a.txt": "7fc56270e7a70fa81a5935b72eacbe29"'));
     expect(environment.buildDir.childFile('service_worker.d'), exists);
     // Depends on resource file.
-    expect(environment.buildDir.childFile('service_worker.d').readAsStringSync(), contains('a/a.txt'));
+    expect(environment.buildDir.childFile('service_worker.d').readAsStringSync(),
+      contains('a/a.txt'));
+    // Contains NOTICES
+    expect(environment.outputDir.childFile('flutter_service_worker.js').readAsStringSync(),
+      contains('NOTICES'));
   }));
 
   test('WebServiceWorker contains baseUrl cache', () => testbed.run(() async {