[observatory] Use current versions of dependencies.

Once upon a time, Observatory was built via pub and needed to cache the result of `pub get` to have stable / reproducible builds. Now it is built directly with dart2js and no longer uses any old packages, so the copies of packages brought in via DEPS are fine.

Change-Id: I7b32910570cd21fbf42cae6ac25b57c72a134c81
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/143403
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>

DEPS

@@ -111,7 +111,6 @@ vars = {
   "mockito_tag": "d39ac507483b9891165e422ec98d9fb480037c8b",
   "mustache_tag" : "5e81b12215566dbe2473b2afd01a8a8aedd56ad9",
   "oauth2_tag": "1.2.1",
-  "observatory_pub_packages_rev": "0894122173b0f98eb08863a7712e78407d4477bc",
   "package_config_tag": "v1.9.2",
   "path_tag": "1.7.0",
   "pedantic_tag": "v1.9.0",
@@ -332,9 +331,6 @@ deps = {
       + "@" + Var("mustache_tag"),
   Var("dart_root") + "/third_party/pkg/oauth2":
       Var("dart_git") + "oauth2.git" + "@" + Var("oauth2_tag"),
-  Var("dart_root") + "/third_party/observatory_pub_packages":
-      Var("dart_git") + "observatory_pub_packages.git"
-      + "@" + Var("observatory_pub_packages_rev"),
   Var("dart_root") + "/third_party/pkg_tested/package_config":
       Var("dart_git") + "package_config.git" +
       "@" + Var("package_config_tag"),

pkg/test_runner/lib/src/options.dart

@@ -615,9 +615,8 @@ compiler.''',
     // Only one value in the configuration map is mutable:
     if (selectors.containsKey('observatory_ui')) {
       if (selectors.length == 1) {
-        configuration['packages'] = Repository.uri
-            .resolve('runtime/observatory/.packages')
-            .toFilePath();
+        configuration['packages'] =
+            Repository.uri.resolve('.packages').toFilePath();
       } else {
         // Make a new configuration whose selectors map only contains
         // observatory_ui, and remove observatory_ui from the original
@@ -630,9 +629,8 @@ compiler.''',
         selectors.remove('observatory_ui');
 
         // Set the packages flag.
-        observatoryConfiguration['packages'] = Repository.uri
-            .resolve('runtime/observatory/.packages')
-            .toFilePath();
+        observatoryConfiguration['packages'] =
+            Repository.uri.resolve('.packages').toFilePath();
 
         return [
           ..._expandConfigurations(configuration, selectors),

runtime/observatory/.packages

@@ -1,31 +0,0 @@
-collection:../../third_party/observatory_pub_packages/packages/collection/lib
-logging:../../third_party/observatory_pub_packages/packages/logging/lib
-path:../../third_party/observatory_pub_packages/packages/path/lib
-stack_trace:../../third_party/observatory_pub_packages/packages/stack_trace/lib
-usage:../../third_party/observatory_pub_packages/packages/usage/lib
-observatory:lib
-
-# Testing only
-async:../../third_party/pkg/async/lib
-boolean_selector:../../third_party/pkg/boolean_selector/lib
-charcode:../../third_party/pkg/charcode/lib
-dart_internal:../../pkg/dart_internal/lib
-expect:../../pkg/expect/lib
-http:../../third_party/pkg/http/lib
-http_parser:../../third_party/pkg/http_parser/lib
-matcher:../../third_party/pkg/matcher/lib
-package_config:../../third_party/pkg_tested/package_config/lib
-pedantic:../../third_party/pkg/pedantic/lib
-pool:../../third_party/pkg/pool/lib
-pub_semver:../../third_party/pkg/pub_semver/lib
-source_map_stack_trace:../../third_party/pkg/source_map_stack_trace/lib
-source_maps:../../third_party/pkg/source_maps/lib
-source_span:../../third_party/pkg/source_span/lib
-stream_channel:../../third_party/pkg/stream_channel/lib
-string_scanner:../../third_party/pkg/string_scanner/lib
-term_glyph:../../third_party/pkg/term_glyph/lib
-test:../../third_party/pkg/test/pkgs/test/lib
-test_api:../../third_party/pkg/test/pkgs/test_api/lib
-test_core:../../third_party/pkg/test/pkgs/test_core/lib
-typed_data:../../third_party/pkg/typed_data/lib
-observatory_test_package:tests/service/observatory_test_package

runtime/observatory/BUILD.gn

@@ -13,7 +13,7 @@ prebuilt_dart2js_action("build_observatory") {
 
   # dart2js produces a .deps file, but it is not in a format that is understood
   # by ninja, so we explicitly list all the sources here.
-  inputs = [ ".packages" ] + observatory_sources
+  inputs = [ "../../.packages" ] + observatory_sources
 
   output = "$target_gen_dir/observatory/web/main.dart.js"
   outputs = [ output ]
@@ -36,7 +36,7 @@ prebuilt_dart2js_action("build_observatory") {
     "-DOBS_VER=${version_string}",
     "-o",
     rebase_path(output),
-    "--packages=" + rebase_path(".packages"),
+    "--packages=" + rebase_path("../../.packages"),
   ]
   if (is_debug) {
     args += [ "--enable-asserts" ]

tools/bots/dart_tests.isolate

@@ -11,7 +11,6 @@
               'third_party/pkg_tested/',
               'third_party/d8/',
               'third_party/firefox_jsshell/',
-              'third_party/observatory_pub_packages/packages/web_components/',
               'tests/angular/',
               'tests/compiler/',
               'tests/corelib_2/',

tools/bots/test_matrix.json

@@ -53,7 +53,6 @@
       "tests/ffi_2/",
       "third_party/babel/babel.min.js",
       "third_party/d8/",
-      "third_party/observatory_pub_packages/packages/web_components/",
       "third_party/pkg/",
       "third_party/pkg_tested/",
       "third_party/requirejs/",
@@ -97,7 +96,6 @@
       "tests/ffi_2/",
       "third_party/babel/babel.min.js",
       "third_party/d8/",
-      "third_party/observatory_pub_packages/packages/web_components/",
       "third_party/pkg/",
       "third_party/pkg_tested/",
       "third_party/requirejs/",
@@ -245,7 +243,6 @@
       "out/ReleaseX64/",
       "third_party/pkg/",
       "third_party/pkg_tested/",
-      "third_party/observatory_pub_packages/packages/",
       "tools/sdks/dart-sdk/",
       "pkg/_fe_analyzer_shared/",
       "pkg/async_helper/",
@@ -305,7 +302,6 @@
       "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip",
       "third_party/pkg/",
       "third_party/pkg_tested/",
-      "third_party/observatory_pub_packages/packages/",
       "tests/.dart_tool/package_config.json",
       "tests/angular/",
       "tests/co19_2/co19_2-analyzer.status",
@@ -391,7 +387,6 @@
       "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip",
       "third_party/pkg/",
       "third_party/pkg_tested/",
-      "third_party/observatory_pub_packages/packages/",
       "tests/.dart_tool/package_config.json",
       "tests/angular/",
       "tests/co19_2/co19_2-analyzer.status",
@@ -3308,7 +3303,6 @@
           "script": "out/ReleaseX64/dart-sdk/bin/dartanalyzer",
           "arguments": [
             "--fatal-warnings",
-            "--packages=runtime/observatory/.packages",
             "runtime/observatory"
           ]
         },