Remoting daemon process to support unofficial client ID

remoting/host/signaling_connector.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/signaling_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/url_request_context.h"
 
 namespace remoting {
 
 namespace {
 
 // The delay between reconnect attempts will increase exponentially up
 // to the maximum specified here.
 const int kMaxReconnectDelaySeconds = 10 * 60;
 
 // Time when we we try to update OAuth token before its expiration.
 const int kTokenUpdateTimeBeforeExpirySeconds = 60;
 
 }  // namespace
 
 SignalingConnector::OAuthCredentials::OAuthCredentials(
     const std::string& login_value,
-    const std::string& refresh_token_value)
+    const std::string& refresh_token_value,
+    const OAuthClientInfo& client_info_value)
     : login(login_value),
-      refresh_token(refresh_token_value) {
+      refresh_token(refresh_token_value),
+      client_info(client_info_value) {
 }
 
 SignalingConnector::SignalingConnector(XmppSignalStrategy* signal_strategy)
     : signal_strategy_(signal_strategy),
       reconnect_attempts_(0),
-      refreshing_oauth_token_(false) {
+      refreshing_oauth_token_(false)
+{

[Sergey Ulanov, 2012/04/19 01:57:32]

Looks like this was unintentional change

[Alpha Left Google, 2012/04/20 22:13:50]

Done.

   net::NetworkChangeNotifier::AddOnlineStateObserver(this);
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   signal_strategy_->AddListener(this);
   ScheduleTryReconnect();
 }
 
 SignalingConnector::~SignalingConnector() {
   signal_strategy_->RemoveListener(this);
   net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
@@ skipping 106 matching lines @@
       LOG(INFO) << "Attempting to connect signaling.";
       signal_strategy_->Connect();
     }
   }
 }
 
 void SignalingConnector::RefreshOAuthToken() {
   DCHECK(CalledOnValidThread());
   LOG(INFO) << "Refreshing OAuth token.";
   DCHECK(!refreshing_oauth_token_);
-#ifdef OFFICIAL_BUILD
-  OAuthClientInfo client_info = {
-    "440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com",
-    "Bgur6DFiOMM1h8x-AQpuTQlK"
-  };
-#else  // OFFICIAL_BUILD
-  OAuthClientInfo client_info = {
-    "440925447803-2pi3v45bff6tp1rde2f7q6lgbor3o5uj.apps.googleusercontent.com",
-    "W2ieEsG-R1gIA4MMurGrgMc_"
-  };
-#endif  // !OFFICIAL_BUILD
+
   refreshing_oauth_token_ = true;
   gaia_oauth_client_->RefreshToken(
-      client_info, oauth_credentials_->refresh_token, 1, this);
+      oauth_credentials_->client_info,
+      oauth_credentials_->refresh_token, 1, this);
 }
 
 }  // namespace remoting