Allowing WhispernetClient to be used during initialization

components/copresence/copresence_manager_impl.cc

 // Copyright 2014 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 "components/copresence/copresence_manager_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 64 matching lines @@
   if (delegate->GetGCMDriver())
     gcm_handler_.reset(new GCMHandlerImpl(delegate->GetGCMDriver(),
                                           directive_handler_.get(),
                                           messages_callback));
 
   rpc_handler_.reset(new RpcHandler(delegate,
                                     state_.get(),
                                     directive_handler_.get(),
                                     gcm_handler_.get(),
                                     messages_callback));
+
+  directive_handler_->Start(delegate_->GetWhispernetClient(),
+                            base::Bind(&CopresenceManagerImpl::ReceivedTokens,
+                                       base::Unretained(this)));
 }
 
 CopresenceManagerImpl::~CopresenceManagerImpl() {
   whispernet_init_callback_.Cancel();
 }
 
 CopresenceState* CopresenceManagerImpl::state() {
   return state_.get();
 }
 
@@ skipping 14 matching lines @@
   rpc_handler_->SendReportRequest(
       request_copy.Pass(), app_id, auth_token, callback);
 }
 
 
 // Private functions.
 
 void CopresenceManagerImpl::WhispernetInitComplete(bool success) {
   if (success) {
     DVLOG(3) << "Whispernet initialized successfully.";
-
-    directive_handler_->Start(delegate_->GetWhispernetClient(),
-                              base::Bind(&CopresenceManagerImpl::ReceivedTokens,
-                                         base::Unretained(this)));
-
-    // Start up timers.
     poll_timer_->Start(FROM_HERE,
                        base::TimeDelta::FromMilliseconds(kPollTimerIntervalMs),
                        base::Bind(&CopresenceManagerImpl::PollForMessages,
                                   base::Unretained(this)));
     audio_check_timer_->Start(
         FROM_HERE, base::TimeDelta::FromMilliseconds(kAudioCheckIntervalMs),
         base::Bind(&CopresenceManagerImpl::AudioCheck, base::Unretained(this)));
   } else {
     LOG(ERROR) << "Whispernet initialization failed!";
     init_failed_ = true;
@@ skipping 122 matching lines @@
   for (const auto& map_entry : messages_by_subscription) {
     // TODO(ckehoe): Once we have the app ID from the server, we need to pass
     // it in here and get rid of the app id registry from the main API class.
     const std::string& subscription = map_entry.first;
     const std::vector<Message>& messages = map_entry.second;
     delegate_->HandleMessages(std::string(), subscription, messages);
   }
 }
 
 }  // namespace copresence