Revert of Revert of Adding CopresenceState

components/copresence/rpc/rpc_handler.cc

Index: components/copresence/rpc/rpc_handler.cc
diff --git a/components/copresence/rpc/rpc_handler.cc b/components/copresence/rpc/rpc_handler.cc
index 78bd95835f1989bb4b3c09dba344cbd407cbdb18..28276ea828b0e2e84314f1fffc08b14242405a28 100644
--- a/components/copresence/rpc/rpc_handler.cc
+++ b/components/copresence/rpc/rpc_handler.cc
@@ -19,6 +19,7 @@
 #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"
@@ -165,10 +166,12 @@
 // 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),
@@ -491,6 +494,7 @@
       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