Remove GaiaOauthClient and GaiaUserEmailFetcher from remoting.

remoting/host/setup/host_starter.cc

 // Copyright (c) 2012 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 "remoting/host/setup/host_starter.h"
 
 #include "base/guid.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/setup/oauth_helper.h"
 
 namespace {
 const int kMaxGetTokensRetries = 3;
 }  // namespace
 
 namespace remoting {
 
 HostStarter::HostStarter(
     scoped_ptr<gaia::GaiaOAuthClient> oauth_client,
-    scoped_ptr<remoting::GaiaUserEmailFetcher> user_email_fetcher,
     scoped_ptr<remoting::ServiceClient> service_client,
     scoped_ptr<remoting::DaemonController> daemon_controller)
     : oauth_client_(oauth_client.Pass()),
-      user_email_fetcher_(user_email_fetcher.Pass()),
       service_client_(service_client.Pass()),
       daemon_controller_(daemon_controller.Pass()),
       consent_to_data_collection_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   main_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 HostStarter::~HostStarter() {
 }
 
 scoped_ptr<HostStarter> HostStarter::Create(
     net::URLRequestContextGetter* url_request_context_getter) {
   scoped_ptr<gaia::GaiaOAuthClient> oauth_client(
       new gaia::GaiaOAuthClient(gaia::kGaiaOAuth2Url,
                                 url_request_context_getter));
-  scoped_ptr<remoting::GaiaUserEmailFetcher> user_email_fetcher(
-      new remoting::GaiaUserEmailFetcher(url_request_context_getter));
   scoped_ptr<remoting::ServiceClient> service_client(
       new remoting::ServiceClient(url_request_context_getter));
   scoped_ptr<remoting::DaemonController> daemon_controller(
       remoting::DaemonController::Create());
   return scoped_ptr<HostStarter>(
-      new HostStarter(oauth_client.Pass(), user_email_fetcher.Pass(),
-                      service_client.Pass(), daemon_controller.Pass()));
+      new HostStarter(oauth_client.Pass(), service_client.Pass(),
+                      daemon_controller.Pass()));
 }
 
 void HostStarter::StartHost(
     const std::string& host_name,
     const std::string& host_pin,
     bool consent_to_data_collection,
     const std::string& auth_code,
     const std::string& redirect_url,
     CompletionCallback on_done) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ skipping 19 matching lines @@
     int expires_in_seconds) {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnGetTokensResponse, weak_ptr_,
         refresh_token, access_token, expires_in_seconds));
     return;
   }
   refresh_token_ = refresh_token;
   access_token_ = access_token;
   // Get the email corresponding to the access token.
-  user_email_fetcher_->GetUserEmail(access_token_, this);
+  oauth_client_->GetUserInfo(access_token_, 1, this);
 }
 
 void HostStarter::OnRefreshTokenResponse(
     const std::string& access_token,
     int expires_in_seconds) {
   // We never request a refresh token, so this call is not expected.
   NOTREACHED();
 }
 
-void HostStarter::OnGetUserEmailResponse(const std::string& user_email) {
+void HostStarter::OnGetUserInfoResponse(const std::string& user_email) {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
-        &HostStarter::OnGetUserEmailResponse, weak_ptr_, user_email));
+        &HostStarter::OnGetUserInfoResponse, weak_ptr_, user_email));
     return;
   }
   user_email_ = user_email;
   // Register the host.
   host_id_ = base::GenerateGUID();
   key_pair_.Generate();
   service_client_->RegisterHost(
       host_id_, host_name_, key_pair_.GetPublicKey(), access_token_, this);
 }
 
@@ skipping 47 matching lines @@
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnNetworkError, weak_ptr_, response_code));
     return;
   }
   CompletionCallback cb = on_done_;
   on_done_.Reset();
   cb.Run(NETWORK_ERROR);
 }
 
 }  // namespace remoting