Fix a bad merge in pkg/stack_trace.

pkg/stack_trace/lib/src/trace.dart

 // Copyright (c) 2013, 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.
 
 library trace;
 
 import 'dart:collection';
 import 'dart:math' as math;
 
 import 'frame.dart';
@@ skipping 64 matching lines @@
     return new LazyTrace(() => new Trace.parse(trace.toString()));
   }
 
   /// Parses a string representation of a stack trace.
   ///
   /// [trace] should be formatted in the same way as a Dart VM or browser stack
   /// trace.
   factory Trace.parse(String trace) {
     try {
       if (trace.isEmpty) return new Trace(<Frame>[]);
-      if (trace.startsWith("Error\n")) return new Trace.parseV8(trace);
+      if (trace.contains(_v8Trace)) return new Trace.parseV8(trace);
       // Valid Safari traces are a superset of valid Firefox traces.
-      if (trace.contains(_firefoxTrace)) return new Trace.parseFirefox(trace);
+      if (trace.contains(_firefoxTrace)) return new Trace.parseSafari(trace);
       if (trace.contains(_friendlyTrace)) return new Trace.parseFriendly(trace);
 
       // Default to parsing the stack trace as a VM trace. This is also hit on
       // IE and Safari, where the stack trace is just an empty string (issue
       // 11257).
       return new Trace.parseVM(trace);
     } on FormatException catch (error) {
       throw new FormatException('${error.message}\nStack trace:\n$trace');
     }
   }
@@ skipping 89 matching lines @@
     // Figure out the longest path so we know how much to pad.
     var longest = frames.map((frame) => frame.location.length)
         .fold(0, math.max);
 
     // Print out the stack trace nicely formatted.
     return frames.map((frame) {
       return '${padRight(frame.location, longest)}  ${frame.member}\n';
     }).join();
   }
 }