Revert of Adding CopresenceState

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.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_state_impl.h"
 #include "components/copresence/copresence_switches.h"
 #include "components/copresence/handlers/directive_handler.h"
 #include "components/copresence/handlers/gcm_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/rpc/http_post.h"
 #include "net/http/http_status_code.h"
@@ skipping 126 matching lines @@
                                     : AUDIO_ULTRASOUND_PASSBAND);
   signals->set_observed_time_millis(base::Time::Now().ToJsTime());
 }
 
 }  // namespace
 
 
 // Public functions.
 
 RpcHandler::RpcHandler(CopresenceDelegate* delegate,
-                       CopresenceStateImpl* state,
                        DirectiveHandler* directive_handler,
                        GCMHandler* gcm_handler,
                        const PostCallback& server_post_callback)
     : delegate_(delegate),
-      state_(state),
       directive_handler_(directive_handler),
       gcm_handler_(gcm_handler),
       server_post_callback_(server_post_callback),
       invalid_audio_token_cache_(
           base::TimeDelta::FromMilliseconds(kInvalidTokenExpiryTimeMs),
           kMaxInvalidTokens) {
     DCHECK(delegate_);
     DCHECK(directive_handler_);
     // |gcm_handler_| is optional.
 
@@ skipping 302 matching lines @@
 
   if (response.has_update_signals_response()) {
     const UpdateSignalsResponse& update_response =
         response.update_signals_response();
     DispatchMessages(update_response.message());
 
     for (const Directive& directive : update_response.directive())
       directive_handler_->AddDirective(directive);
 
     for (const Token& token : update_response.token()) {
-      state_->UpdateTokenStatus(token.id(), token.status());
       switch (token.status()) {
         case VALID:
           // TODO(rkc/ckehoe): Store the token in a |valid_token_cache_| with a
           // short TTL (like 10s) and send it up with every report request.
           // Then we'll still get messages while we're waiting to hear it again.
           VLOG(1) << "Got valid token " << token.id();
           break;
         case INVALID:
           DVLOG(3) << "Discarding invalid token " << token.id();
           invalid_audio_token_cache_.Add(token.id(), true);
@@ skipping 128 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