[Chromoting] Let the Linux start-host app take a redirect-URL parameter.

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/values.h"
 #include "crypto/random.h"
 #include "google_apis/google_api_keys.h"
 #include "remoting/host/pin_hash.h"
@@ skipping 49 matching lines @@
     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()),
       in_progress_(false),
       consent_to_data_collection_(false) {
-  oauth_client_info_.client_id =
-    google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING);
-  oauth_client_info_.client_secret =
-    google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING);
-  oauth_client_info_.redirect_uri = GetOauthRedirectUrl();
 }
 
 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()));
 }
 
 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) {
   if (in_progress_) {
     on_done.Run(START_IN_PROGRESS);
     return;
   }
   in_progress_ = true;
   host_name_ = host_name;
   host_pin_ = host_pin;
   consent_to_data_collection_ = consent_to_data_collection;
   on_done_ = on_done;
+  oauth_client_info_.client_id =
+    google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING);

[Sergey Ulanov, 2012/10/17 23:41:36]

nit: 4-space indent here and below.

[simonmorris, 2012/10/18 00:10:09]

Done.

+  oauth_client_info_.client_secret =
+    google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING);
+  oauth_client_info_.redirect_uri = redirect_url;
   // Map the authorization code to refresh and access tokens.
   oauth_client_->GetTokensFromAuthCode(oauth_client_info_, auth_code,
                                        kMaxGetTokensRetries, this);
 }
 
 void HostStarter::OnGetTokensResponse(
     const std::string& refresh_token,
     const std::string& access_token,
     int expires_in_seconds) {
   refresh_token_ = refresh_token;
@@ skipping 46 matching lines @@
 
 void HostStarter::OnRefreshTokenResponse(
     const std::string& access_token,
     int expires_in_seconds) {
   NOTREACHED();
   on_done_.Run(OAUTH_ERROR);
   in_progress_ = false;
 }
 
 }  // namespace remoting