1 files changed, 15 insertions, 17 deletions

diff --git a/chromium/third_party/WebKit/Tools/GardeningServer/scripts/controllers.js b/chromium/third_party/WebKit/Tools/GardeningServer/scripts/controllers.js
index 5a6d07e353d..964d9e84c88 100644
--- a/chromium/third_party/WebKit/Tools/GardeningServer/scripts/controllers.js
+++ b/chromium/third_party/WebKit/Tools/GardeningServer/scripts/controllers.js
@@ -53,8 +53,19 @@ function rebaselineWithStatusUpdates(failureInfoList, resultsByTest)
     });
 
     if (failuresToRebaseline.length) {
-        checkout.rebaseline(failuresToRebaseline, function() {
-            statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowhand".');
+        // FIXME: checkout.rebaseline() accepts only 3 arguments, we pass 5.
+        checkout.rebaseline(failuresToRebaseline, function(response) {
+            try {
+                var json = JSON.parse(response);
+                if (!json.result_code) {
+                    statusView.addFinalMessage(id, 'Rebaseline done! Please commit locally and land with "git cl dcommit".');
+                } else {
+                    statusView.addMessage(id, 'Rebaseline failed (code=' + json.result_code + ')!');
+                    statusView.addFinalMessage(id, json.output);
+                }
+            } catch (e) {
+                statusView.addFinalMessage(id, 'Invalid response received: "' + response + '"');
+            }
         }, function(failureInfo) {
             statusView.addMessage(id, failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName));
         }, function() {
@@ -88,7 +99,7 @@ function updateExpectationsWithStatusUpdates(failureInfoList)
     statusView.addMessage(id, 'Updating expectations of ' + testName + '...');
 
     checkout.updateExpectations(failureInfoList, function() {
-        statusView.addFinalMessage(id, 'Expectations update done! Please land with "webkit-patch land-cowhand".');
+        statusView.addFinalMessage(id, 'Expectations update done! Please commit them locally and land with "git cl dcommit".');
     }, function() {
         statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
     });
@@ -294,26 +305,13 @@ controllers.UnexpectedFailures = base.extends(FailureStreamController, {
     },
     onRollout: function(revision, testNameList)
     {
-        checkout.rollout(revision, ui.rolloutReasonForTestNameList(testNameList), $.noop, function() {
+        checkout.rollout(revision, ui.rolloutReasonForTestNameList(testNameList)).then($.noop, function() {
             // FIXME: We should have a better error UI.
             alert(kCheckoutUnavailableMessage);
         });
     }
 });
 
-controllers.Failures = base.extends(FailureStreamController, {
-    _resultsFilter: results.expectedFailuresByTest,
-
-    _keyFor: function(failureAnalysis)
-    {
-        return base.dirName(failureAnalysis.testName);
-    },
-    _createFailureView: function(failureAnalysis)
-    {
-        return new ui.notifications.FailingTests();
-    },
-});
-
 controllers.FailingBuilders = base.extends(Object, {
     init: function(view, message)
     {