Add polling and audio check to copresence.

components/copresence/rpc/rpc_handler.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/rpc/rpc_handler.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 // TODO(ckehoe): time.h includes windows.h, which #defines DeviceCapabilities
 // to DeviceCapabilitiesW. This breaks the pb.h headers below. For now,
 // we fix this with an #undef.
 #include "base/time/time.h"
 #if defined(OS_WIN)
 #undef DeviceCapabilities
 #endif
 
 #include "components/copresence/copresence_switches.h"
 #include "components/copresence/handlers/directive_handler.h"
 #include "components/copresence/proto/codes.pb.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/public/copresence_constants.h"
 #include "components/copresence/public/copresence_delegate.h"
-#include "components/copresence/public/whispernet_client.h"
 #include "components/copresence/rpc/http_post.h"
 #include "net/http/http_status_code.h"
 
 // TODO(ckehoe): Return error messages for bad requests.
 
 namespace copresence {
 
 using google::protobuf::MessageLite;
 using google::protobuf::RepeatedPtrField;
 
@@ skipping 123 matching lines @@
     DCHECK(delegate_);
     DCHECK(directive_handler_);
 
     if (server_post_callback_.is_null()) {
       server_post_callback_ =
           base::Bind(&RpcHandler::SendHttpPost, base::Unretained(this));
     }
   }
 
 RpcHandler::~RpcHandler() {
-  for (HttpPost* post : pending_posts_) {
+  // Do not use |directive_handler_| here, it will already have been
+  // destructed.
+  for (HttpPost* post : pending_posts_)
     delete post;
-  }
-
-  // TODO(ckehoe): Register and cancel these callbacks in the same class.
-  delegate_->GetWhispernetClient()->RegisterTokensCallback(
-      WhispernetClient::TokensCallback());
-  delegate_->GetWhispernetClient()->RegisterSamplesCallback(
-      WhispernetClient::SamplesCallback());
 }
 
 void RpcHandler::RegisterForToken(const std::string& auth_token,
                                   const SuccessCallback& init_done_callback) {
   if (IsRegisteredForToken(auth_token)) {
     LOG(WARNING) << "Attempted re-registration for the same auth token.";
     init_done_callback.Run(true);
     return;
   }
   scoped_ptr<RegisterDeviceRequest> request(new RegisterDeviceRequest);
@@ skipping 324 matching lines @@
       api_key,
       auth_token,
       command_line->GetSwitchValueASCII(switches::kCopresenceTracingToken),
       *request_proto);
 
   http_post->Start(base::Bind(callback, http_post));
   pending_posts_.insert(http_post);
 }
 
 }  // namespace copresence