From 75858bdb99e1796eb80c91a4a7e080de4734127b Mon Sep 17 00:00:00 2001
From: Yvonne Yip <ykyyip@google.com>
Date: Tue, 8 Oct 2013 14:07:30 -0700
Subject: [PATCH] test: only launch canary with flags on mac

---
 gruntfile.js | 5 +++--
 package.json | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index b0fc2b9..60921d4 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -54,10 +54,11 @@ module.exports = function(grunt) {
     }
   });
 
+  grunt.loadTasks('../tools/tasks');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-contrib-concat');
 
   grunt.registerTask('default', 'concat');
-  grunt.registerTask('test', ['karma:polymer-expressions']);
-  grunt.registerTask('test-buildbot', ['karma:buildbot']);
+  grunt.registerTask('test', ['override-chrome-launcher', 'karma:polymer-expressions']);
+  grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot']);
 };
diff --git a/package.json b/package.json
index 22f5bd5..e584587 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "grunt": "~0.4.1",
     "grunt-karma": "*",
     "karma-mocha": "*",
-		"karma-chrome-launcher": "morethanreal/karma-chrome-launcher",
     "karma-ie-launcher": "*",
     "karma-safari-launcher": "*",
     "karma-script-launcher": "*",