Fix buildbot_data_test

tools/gardening/lib/src/buildbot_structures.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'util.dart';
 
 /// The [Uri] of a build step stdio log split into its subparts.
 class BuildUri {
-  final String scheme;
-  final String host;
-  final String prefix;
   final String botName;
   final int buildNumber;
   final String stepName;
-  final String suffix;
 
   factory BuildUri(Uri uri) {
     List<String> parts = split(Uri.decodeFull(uri.path),
         ['/builders/', '/builds/', '/steps/', '/logs/']);
     String botName = parts[1];
     int buildNumber = int.parse(parts[2]);
     String stepName = parts[3];
     return new BuildUri.fromData(botName, buildNumber, stepName);
   }
 
   factory BuildUri.fromUrl(String url) {
     if (!url.endsWith('/text')) {
       // Use the text version of the stdio log.
       url += '/text';
     }
     return new BuildUri(Uri.parse(url));
   }
 
-  factory BuildUri.fromData(String botName, int buildNumber, String stepName) {
-    return new BuildUri.internal('https', 'build.chromium.org',
-        '/p/client.dart', botName, buildNumber, stepName, 'stdio/text');
-  }
-
-  BuildUri.internal(this.scheme, this.host, this.prefix, this.botName,
-      this.buildNumber, this.stepName, this.suffix);
+  BuildUri.fromData(this.botName, this.buildNumber, this.stepName);
 
   BuildUri withBuildNumber(int buildNumber) {
     return new BuildUri.fromData(botName, buildNumber, stepName);
   }
 
   int get absoluteBuildNumber => buildNumber >= 0 ? buildNumber : null;
 
   String get shortBuildName => '$botName/$stepName';
 
   String get buildName =>
       '/builders/$botName/builds/$buildNumber/steps/$stepName';
 
-  String get path => '$prefix$buildName/logs/$suffix';
+  String get path => '/p/client.dart$buildName/logs/stdio/text';
 
   /// Returns the path used in logdog for this build uri.
   ///
   /// Since logdog only supports absolute build numbers, [buildNumber] must be
   /// non-negative. A [StateError] is thrown, otherwise.
   String get logdogPath {
     if (buildNumber < 0)
       throw new StateError('BuildUri $buildName must have a non-negative build '
           'number to a valid logdog path.');
     return 'chromium/bb/client.dart/$botName/$buildNumber/+/recipes/steps/'
         '${stepName.replaceAll(' ', '_')}/0/stdout';
   }
 
   /// Creates the [Uri] for this build step stdio log.
   Uri toUri() {
-    return new Uri(scheme: scheme, host: host, path: path);
+    return new Uri(scheme: 'https', host: 'build.chromium.org', path: path);
   }
 
   /// Returns the [BuildUri] the previous build of this build step.
   BuildUri prev() {
-    return new BuildUri.internal(
-        scheme, host, prefix, botName, buildNumber - 1, stepName, suffix);
+    return new BuildUri.fromData(botName, buildNumber - 1, stepName);
   }
 
   String toString() {
     return buildName;
   }
 }
 
 /// Id for a test on a specific configuration, for instance
 /// `dart2js-chrome release_x64 co19/Language/Metadata/before_function_t07`.
 class TestConfiguration {
@@ skipping 143 matching lines @@
 
 /// The result of a single test for a single test step.
 class TestStatus {
   final TestConfiguration config;
   final String status;
 
   TestStatus(this.config, this.status);
 
   String toString() => '$config: $status';
 }