cros: Terminate if merge session fails for online sign-in

google_apis/gaia/fake_gaia.cc

 // Copyright (c) 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 "google_apis/gaia/fake_gaia.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base_paths.h"
@@ skipping 507 matching lines @@
   http_response->set_code(net::HTTP_OK);
   http_response->set_content(embedded_setup_chromeos_response_);
   http_response->set_content_type("text/html");
 }
 
 void FakeGaia::HandleOAuthLogin(const HttpRequest& request,
                                 BasicHttpResponse* http_response) {
   http_response->set_code(net::HTTP_UNAUTHORIZED);
   if (merge_session_params_.gaia_uber_token.empty()) {
     http_response->set_code(net::HTTP_FORBIDDEN);
+    http_response->set_content("Error=BadAuthentication");
     return;
   }
 
   std::string access_token;
   if (!GetAccessToken(request, kAuthHeaderBearer, &access_token) &&
       !GetAccessToken(request, kAuthHeaderOAuth, &access_token)) {
     LOG(ERROR) << "/OAuthLogin missing access token in the header";
     return;
   }
 
@@ skipping 308 matching lines @@
   http_response->AddCustomHeader("Google-Accounts-SAML", "Start");
   http_response->AddCustomHeader("Location", redirect_url);
 }
 
 void FakeGaia::HandleGetCheckConnectionInfo(
     const net::test_server::HttpRequest& request,
     net::test_server::BasicHttpResponse* http_response) {
   base::ListValue connection_list;
   FormatJSONResponse(connection_list, http_response);
 }