Updated remoting host to create instances of GCD-related classes.

remoting/host/signaling_connector.h

 // 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.
 
 #ifndef REMOTING_HOST_SIGNALING_CONNECTOR_H_
 #define REMOTING_HOST_SIGNALING_CONNECTOR_H_
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 13 matching lines @@
 // backoff. It also monitors network state and reconnects signalling
 // whenever connection type changes or IP address changes.
 class SignalingConnector
     : public base::SupportsWeakPtr<SignalingConnector>,
       public base::NonThreadSafe,
       public SignalStrategy::Listener,
       public net::NetworkChangeNotifier::ConnectionTypeObserver,
       public net::NetworkChangeNotifier::IPAddressObserver {
  public:
   // The |auth_failed_callback| is called when authentication fails.
-  SignalingConnector(
-      XmppSignalStrategy* signal_strategy,
-      scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker,
-      scoped_ptr<OAuthTokenGetter> oauth_token_getter,
-      const base::Closure& auth_failed_callback);
+  SignalingConnector(XmppSignalStrategy* signal_strategy,
+                     scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker,
+                     OAuthTokenGetter* oauth_token_getter,
+                     const base::Closure& auth_failed_callback);
   ~SignalingConnector() override;
 
   // OAuthTokenGetter callback.
   void OnAccessToken(OAuthTokenGetter::Status status,
                      const std::string& user_email,
                      const std::string& access_token);
 
   // SignalStrategy::Listener interface.
   void OnSignalStrategyStateChange(SignalStrategy::State state) override;
   bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
 
   // NetworkChangeNotifier::ConnectionTypeObserver interface.
   void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // NetworkChangeNotifier::IPAddressObserver interface.
   void OnIPAddressChanged() override;
 
  private:
   void OnNetworkError();
   void ScheduleTryReconnect();
   void ResetAndTryReconnect();
   void TryReconnect();
   void OnDnsBlackholeCheckerDone(bool allow);
 
   XmppSignalStrategy* signal_strategy_;
   base::Closure auth_failed_callback_;
   scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker_;
 
-  scoped_ptr<OAuthTokenGetter> oauth_token_getter_;
+  OAuthTokenGetter* oauth_token_getter_;
 
   // Number of times we tried to connect without success.
   int reconnect_attempts_;
 
   base::OneShotTimer<SignalingConnector> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SignalingConnector);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SIGNALING_CONNECTOR_H_