Version 1.8.0-dev.4.1

svn merge -c 41704 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 41705 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 41711 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

git-svn-id: http://dart.googlecode.com/svn/trunk@41762 260f80e4-7a28-3924-810f-c04153c831b5

Author: ricowind

pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

@@ -1672,34 +1672,6 @@ class OldEmitter implements Emitter {
         ..add(assembledCode)
         ..close();
     compiler.assembledCode = assembledCode;
-
-    if (!compiler.useContentSecurityPolicy) {
-      CodeBuffer cspBuffer = new CodeBuffer();
-      cspBuffer.add(mainBuffer);
-      cspBuffer.write("""
-{
-  var message =
-      'Deprecation: Automatic generation of output for Content Security\\n' +
-      'Policy is deprecated and will be removed with the next development\\n' +
-      'release. Use the --csp option to generate CSP restricted output.';
-  if (typeof dartPrint == "function") {
-    dartPrint(message);
-  } else if (typeof console == "object" && typeof console.log == "function") {
-    console.log(message);
-  } else if (typeof print == "function") {
-    print(message);
-  }
-}\n""");
-
-      cspBuffer.write(
-          jsAst.prettyPrint(
-              precompiledFunctionAst, compiler,
-              allowVariableMinification: false).getText());
-
-      compiler.outputProvider('', 'precompiled.js')
-          ..add(cspBuffer.getText())
-          ..close();
-    }
   }
 
   /// Returns a map from OutputUnit to a hash of its content. The hash uniquely

runtime/lib/errors_patch.dart

@@ -3,12 +3,17 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:mirrors' show MirrorSystem;
+import 'dart:convert' show JSON;
 
 patch class Error {
   /* patch */ static String _objectToString(Object object) {
     return Object._toString(object);
   }
 
+  /* patch */ static String _stringToSafeString(String string) {
+    return JSON.encode(string);
+  }
+
   /* patch */ StackTrace get stackTrace => _stackTrace;
 
   StackTrace _stackTrace;

sdk/lib/_internal/compiler/js_lib/core_patch.dart

@@ -8,6 +8,7 @@ import 'dart:_interceptors';
 import 'dart:_js_helper' show patch,
                               checkInt,
                               getRuntimeType,
+                              jsonEncodeNative,
                               JSSyntaxRegExp,
                               Primitives,
                               stringJoinUnchecked,
@@ -140,6 +141,11 @@ class Error {
     return Primitives.objectToString(object);
   }
 
+  @patch
+  static String _stringToSafeString(String string) {
+    return jsonEncodeNative(string);
+  }
+
   @patch
   StackTrace get stackTrace => Primitives.extractStackTrace(this);
 }

sdk/lib/_internal/compiler/js_lib/js_helper.dart

@@ -3238,6 +3238,10 @@ int random64() {
   return int32a + int32b * 0x100000000;
 }
 
+String jsonEncodeNative(String string) {
+  return JS("String", "JSON.stringify(#)", string);
+}
+
 /**
  * Returns a property name for placing data on JavaScript objects shared between
  * DOM isolates.  This happens when multiple programs are loaded in the same

sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart

@@ -37,7 +37,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "foo", "web"],
-        output: new RegExp(r'Built 16 files to "build".'));
+        output: new RegExp(r'Built 12 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [

sdk/lib/_internal/pub/test/build/copies_browser_js_with_dependency_override_test.dart

@@ -36,7 +36,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "--all"],
-        output: new RegExp(r'Built 4 files to "build".'));
+        output: new RegExp(r'Built 3 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [

sdk/lib/_internal/pub/test/build/copies_browser_js_with_dev_dependency_test.dart

@@ -36,7 +36,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "--all"],
-        output: new RegExp(r'Built 4 files to "build".'));
+        output: new RegExp(r'Built 3 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [

sdk/lib/_internal/pub/test/build/outputs_results_to_json_test.dart

@@ -26,7 +26,7 @@ main() {
         outputJson: {
           'buildResult': 'success',
           'outputDirectory': 'build',
-          'numFiles': 2,
+          'numFiles': 1,
           'log': [
             {
               'level': 'Info',

sdk/lib/_internal/pub/test/dart2js/compiles_entrypoints_in_root_package_test.dart

@@ -40,7 +40,7 @@ main() {
     ]).create();
 
     schedulePub(args: ["build", "benchmark", "foo", "web"],
-        output: new RegExp(r'Built 12 files to "build".'));
+        output: new RegExp(r'Built 6 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [

sdk/lib/_internal/pub/test/dart2js/omits_source_map_in_release_test.dart

@@ -16,7 +16,7 @@ main() {
     ]).create();
 
     schedulePub(args: ["build"],
-        output: new RegExp(r'Built 2 files to "build".'),
+        output: new RegExp(r'Built 1 file to "build".'),
         exitCode: 0);
 
     d.dir(appPath, [