Adding CopresenceState

chrome/browser/extensions/api/copresence/copresence_api_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 "base/json/json_writer.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/browser/extensions/extension_api_unittest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "components/copresence/copresence_state_impl.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/public/copresence_manager.h"
 
 using base::ListValue;
 using copresence::AUDIO_CONFIGURATION_AUDIBLE;
 using copresence::AUDIO_CONFIGURATION_UNKNOWN;
 using copresence::BROADCAST_ONLY;
 using copresence::CopresenceDelegate;
 using copresence::CopresenceManager;
+using copresence::CopresenceState;
+using copresence::CopresenceStateImpl;
 using copresence::FAIL;
 using copresence::PublishedMessage;
 using copresence::ReportRequest;
 using copresence::SCAN_ONLY;
 using copresence::Subscription;
 using google::protobuf::RepeatedPtrField;
 
 namespace test_utils = extension_function_test_utils;
 
 namespace extensions {
@@ skipping 30 matching lines @@
 
 template <typename T>
 bool GetOnly(const RepeatedPtrField<T>& things, T* out) {
   if (things.size() != 1)
     return false;
 
   *out = things.Get(0);
   return true;
 }
 
-class MockCopresenceManager : public CopresenceManager {
+class FakeCopresenceManager : public CopresenceManager {
  public:
-  explicit MockCopresenceManager(CopresenceDelegate* delegate)
-      : delegate_(delegate) {}
-  ~MockCopresenceManager() override {}
+  explicit FakeCopresenceManager(CopresenceDelegate* delegate)
+      : delegate_(delegate),
+        // TODO(ckehoe): Use a StubCopresenceState here.
+        state_(new CopresenceStateImpl) {}

[rkc, 2014/12/18 18:12:09]

Why aren't we using a stub here at the moment?

[Charlie, 2014/12/19 03:53:33]

Because Andrew doesn't want me to spend a lot of time on the debug UI :-)

[Charlie, 2014/12/19 07:06:44]

Nevermind, I realized we actually don't need this at all.

+  ~FakeCopresenceManager() override {}
 
+  // CopresenceManager overrides.
+  CopresenceState* state() override { return state_.get(); }
   void ExecuteReportRequest(
       const ReportRequest& request,
       const std::string& app_id,
       const std::string& /* auth_token */,
       const copresence::StatusCallback& status_callback) override {
     request_ = request;
     app_id_ = app_id;
     status_callback.Run(copresence::SUCCESS);
   }
 
   CopresenceDelegate* delegate_;
+  scoped_ptr<CopresenceStateImpl> state_;
 
   ReportRequest request_;
   std::string app_id_;
 };
 
 class CopresenceApiUnittest : public ExtensionApiUnittest {
  public:
   CopresenceApiUnittest() {}
   ~CopresenceApiUnittest() override {}
 
   void SetUp() override {
     ExtensionApiUnittest::SetUp();
 
     CopresenceService* service =
         CopresenceService::GetFactoryInstance()->Get(profile());
-    copresence_manager_ = new MockCopresenceManager(service);
+    copresence_manager_ = new FakeCopresenceManager(service);
     service->set_manager_for_testing(
         make_scoped_ptr<CopresenceManager>(copresence_manager_));
   }
 
   // Takes ownership of the operation_list.
   bool ExecuteOperations(ListValue* operation_list) {
     scoped_ptr<ListValue> args_list(new ListValue);
     args_list->Append(operation_list);
 
     scoped_refptr<UIThreadExtensionFunction> function =
@@ skipping 14 matching lines @@
 
   const ReportRequest& request_sent() const {
     return copresence_manager_->request_;
   }
 
   const std::string& app_id_sent() const {
     return copresence_manager_->app_id_;
   }
 
   void clear_app_id() {
-    copresence_manager_->app_id_ = "";
+    copresence_manager_->app_id_.clear();
   }
 
   CopresenceDelegate* delegate() {
     return copresence_manager_->delegate_;
   }
 
  protected:
-  MockCopresenceManager* copresence_manager_;
+  FakeCopresenceManager* copresence_manager_;
 };
 
 TEST_F(CopresenceApiUnittest, Publish) {
   scoped_ptr<PublishOperation> publish(CreatePublish("pub"));
   publish->strategies.reset(new Strategy);
   publish->strategies->only_broadcast.reset(new bool(true));  // Default
 
   scoped_ptr<Operation> operation(new Operation);
   operation->publish = publish.Pass();
 
@@ skipping 126 matching lines @@
   scoped_ptr<Operation> multi_operation(new Operation);
   multi_operation->publish.reset(CreatePublish("pub"));
   multi_operation->subscribe.reset(CreateSubscribe("sub"));
 
   EXPECT_FALSE(ExecuteOperation(multi_operation.Pass()));
 }
 
 }  // namespace extensions
 
 // TODO(ckehoe): add tests for auth tokens and api key functionality