Revert of Adding CopresenceState

components/copresence/rpc/rpc_handler_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
-#include "components/copresence/copresence_state_impl.h"
 #include "components/copresence/handlers/directive_handler.h"
 #include "components/copresence/mediums/audio/audio_manager.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/enums.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/test/fake_directive_handler.h"
 #include "components/copresence/test/stub_whispernet_client.h"
 #include "net/http/http_status_code.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ skipping 18 matching lines @@
     message_proto->add_subscription_id(subscription_id);
   }
 }
 
 }  // namespace
 
 class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
  public:
   RpcHandlerTest()
       : whispernet_client_(new StubWhispernetClient),
-        // TODO(ckehoe): Use a FakeCopresenceState here
-        // and test that it gets called correctly.
-        state_(new CopresenceStateImpl),
         rpc_handler_(this,
-                     state_.get(),
                      &directive_handler_,
                      nullptr,
                      base::Bind(&RpcHandlerTest::CaptureHttpPost,
                                 base::Unretained(this))),
         status_(SUCCESS) {}
 
   // CopresenceDelegate implementation
 
   void HandleMessages(const std::string& /* app_id */,
                       const std::string& subscription_id,
@@ skipping 83 matching lines @@
 
   bool TokenIsInvalid(const std::string& token) {
     return rpc_handler_.invalid_audio_token_cache_.HasKey(token);
   }
 
   // For rpc_handler_.invalid_audio_token_cache_
   base::MessageLoop message_loop_;
 
   scoped_ptr<WhispernetClient> whispernet_client_;
   FakeDirectiveHandler directive_handler_;
-  scoped_ptr<CopresenceStateImpl> state_;
   RpcHandler rpc_handler_;
 
   CopresenceStatus status_;
   std::string rpc_name_;
   std::string api_key_;
   std::string auth_token_;
   ScopedVector<MessageLite> request_protos_;
   std::map<std::string, std::vector<std::string>> messages_by_subscription_;
 
  private:
@@ skipping 182 matching lines @@
   EXPECT_TRUE(TokenIsInvalid("bad token"));
   EXPECT_THAT(messages_by_subscription_["Subscription 1"],
               ElementsAre("Message A", "Message C"));
   EXPECT_THAT(messages_by_subscription_["Subscription 2"],
               ElementsAre("Message B", "Message C"));
   EXPECT_THAT(directive_handler_.added_directives(),
               ElementsAre("Subscription 1", "Subscription 2"));
 }
 
 }  // namespace copresence