Changed VZ activation logic to always attempt OTA even for brand new devices.

chrome/browser/resources/chromeos/mobile_setup.js

Index: chrome/browser/resources/chromeos/mobile_setup.js
diff --git a/chrome/browser/resources/chromeos/mobile_setup.js b/chrome/browser/resources/chromeos/mobile_setup.js
index c871fe920aa8be36daaabf75f33c126d6b51beab..6667b81ac6292606a6afea2d972b60924daa7fb7 100644
--- a/chrome/browser/resources/chromeos/mobile_setup.js
+++ b/chrome/browser/resources/chromeos/mobile_setup.js
@@ -77,18 +77,6 @@ cr.define('mobile', function() {
         $('finalStatus').classList.add('hidden');
       });
 
-      $('cancelButton').addEventListener('click', function(e) {
-        if (self.state_ == MobileSetup.PLAN_ACTIVATION_DONE ||
-            self.state_ == MobileSetup.PLAN_ACTIVATION_ERROR) {
-          window.close();
-          return;
-        }
-        self.confirm_.show(
-          MobileSetup.localStrings_.getString('cancel_question'), function() {
-            window.close();
-        });
-      });
-
       this.changeState_({state: MobileSetup.PLAN_ACTIVATION_PAGE_LOADING});
       // Kick off activation process.
       chrome.send('startActivation');
@@ -225,8 +213,6 @@ cr.define('mobile', function() {
             $('closeButton').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
-            $('cancelButton').textContent =
-                MobileSetup.localStrings_.getString('close_button');
           }
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
@@ -244,8 +230,6 @@ cr.define('mobile', function() {
             $('closeButton').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
-            $('cancelButton').textContent =
-                MobileSetup.localStrings_.getString('close_button');
           }
           $('finalStatus').classList.remove('hidden');
           break;