Adding CopresenceState

chrome/browser/extensions/api/copresence/copresence_api_unittest.cc

Index: chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
index 4a7f536b7076ee72398fc7555a1518108feb8512..8667b5e62989ea3ef9a260f558820bf6384c9730 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
@@ -3,10 +3,12 @@
 // 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"
@@ -17,6 +19,8 @@ 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;
@@ -67,12 +71,16 @@ bool GetOnly(const RepeatedPtrField<T>& things, T* out) {
   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,
@@ -84,6 +92,7 @@ class MockCopresenceManager : public CopresenceManager {
   }
 
   CopresenceDelegate* delegate_;
+  scoped_ptr<CopresenceStateImpl> state_;
 
   ReportRequest request_;
   std::string app_id_;
@@ -99,7 +108,7 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
 
     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_));
   }
@@ -134,7 +143,7 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
   }
 
   void clear_app_id() {
-    copresence_manager_->app_id_ = "";
+    copresence_manager_->app_id_.clear();
   }
 
   CopresenceDelegate* delegate() {
@@ -142,7 +151,7 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
   }
 
  protected:
-  MockCopresenceManager* copresence_manager_;
+  FakeCopresenceManager* copresence_manager_;
 };
 
 TEST_F(CopresenceApiUnittest, Publish) {