Revert of ChromeOS: Enable Gaia v2 API by default.

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

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 0f10fc1ecbb8fc7d56234c76a8e1dee36beb1dd1..88d1809a9abd3acf5daf281fb3c848f03445b8dd 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -352,15 +352,12 @@
     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;