Revert of ChromeOS: Enable Gaia v2 API by default.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "ash/system/devicetype_utils.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/feature_list.h"
@@ skipping 334 matching lines @@
     if (command_line->HasSwitch(switches::kEafeUrl))
       eafe_url = command_line->GetSwitchValueASCII(switches::kEafeUrl);
     std::string eafe_path = "planters/cbaudioChrome";
     if (command_line->HasSwitch(switches::kEafePath))
       eafe_path = command_line->GetSwitchValueASCII(switches::kEafePath);
 
     params.SetString("gaiaUrl", eafe_url);
     params.SetString("gaiaPath", eafe_path);
   }
 
-  // Easy bootstrap is not v2-compatible
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kCrosGaiaApiV1) ||
-      use_easy_bootstrap_) {
+          switches::kCrosGaiaApiV1)) {
     params.SetString("chromeOSApiVersion", "1");
-  } else {
-    // This enables GLIF MM UI for the online Gaia screen by default.
-    // (see https://crbug.com/709244 ).
-    params.SetString("chromeOSApiVersion", "2");
+  } else if (use_easy_bootstrap_) {
+    // Easy bootstrap is not v2-compatible
+    params.SetString("chromeOSApiVersion", "1");
   }
 
   frame_state_ = FRAME_STATE_LOADING;
   CallJS("loadAuthExtension", params);
 }
 
 void GaiaScreenHandler::ReloadGaia(bool force_reload) {
   if (frame_state_ == FRAME_STATE_LOADING && !force_reload) {
     VLOG(1) << "Skipping reloading of Gaia since gaia is loading.";
     return;
@@ skipping 620 matching lines @@
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   return signin_screen_handler_->delegate_;
 }
 
 bool GaiaScreenHandler::IsRestrictiveProxy() const {
   return !disable_restrictive_proxy_check_for_test_ &&
          !IsOnline(captive_portal_status_);
 }
 
 }  // namespace chromeos