| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/json/json_writer.h" | 5 #include "base/json/json_writer.h" |
| 6 #include "base/macros.h" |
| 6 #include "base/values.h" | 7 #include "base/values.h" |
| 7 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 8 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
| 8 #include "chrome/browser/extensions/extension_api_unittest.h" | 9 #include "chrome/browser/extensions/extension_api_unittest.h" |
| 9 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 10 #include "components/copresence/proto/data.pb.h" | 11 #include "components/copresence/proto/data.pb.h" |
| 11 #include "components/copresence/proto/rpcs.pb.h" | 12 #include "components/copresence/proto/rpcs.pb.h" |
| 12 #include "components/copresence/public/copresence_manager.h" | 13 #include "components/copresence/public/copresence_manager.h" |
| 13 | 14 |
| 14 using base::ListValue; | 15 using base::ListValue; |
| 15 using copresence::AUDIO_CONFIGURATION_AUDIBLE; | 16 using copresence::AUDIO_CONFIGURATION_AUDIBLE; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 36 using api::copresence::UnpublishOperation; | 37 using api::copresence::UnpublishOperation; |
| 37 using api::copresence::UnsubscribeOperation; | 38 using api::copresence::UnsubscribeOperation; |
| 38 | 39 |
| 39 | 40 |
| 40 PublishOperation* CreatePublish(const std::string& id) { | 41 PublishOperation* CreatePublish(const std::string& id) { |
| 41 PublishOperation* publish = new PublishOperation; | 42 PublishOperation* publish = new PublishOperation; |
| 42 | 43 |
| 43 publish->id = id; | 44 publish->id = id; |
| 44 publish->time_to_live_millis.reset(new int(1000)); | 45 publish->time_to_live_millis.reset(new int(1000)); |
| 45 publish->message.type = "joke"; | 46 publish->message.type = "joke"; |
| 46 publish->message.payload = "Knock Knock!"; | 47 const char kPayload[] = "Knock Knock!"; |
| 48 publish->message.payload.assign(kPayload, kPayload + arraysize(kPayload)); |
| 47 | 49 |
| 48 return publish; | 50 return publish; |
| 49 } | 51 } |
| 50 | 52 |
| 51 SubscribeOperation* CreateSubscribe(const std::string& id) { | 53 SubscribeOperation* CreateSubscribe(const std::string& id) { |
| 52 SubscribeOperation* subscribe = new SubscribeOperation; | 54 SubscribeOperation* subscribe = new SubscribeOperation; |
| 53 | 55 |
| 54 subscribe->id = id; | 56 subscribe->id = id; |
| 55 subscribe->time_to_live_millis.reset(new int(1000)); | 57 subscribe->time_to_live_millis.reset(new int(1000)); |
| 56 subscribe->filter.type = "joke"; | 58 subscribe->filter.type = "joke"; |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 scoped_ptr<Operation> multi_operation(new Operation); | 289 scoped_ptr<Operation> multi_operation(new Operation); |
| 288 multi_operation->publish.reset(CreatePublish("pub")); | 290 multi_operation->publish.reset(CreatePublish("pub")); |
| 289 multi_operation->subscribe.reset(CreateSubscribe("sub")); | 291 multi_operation->subscribe.reset(CreateSubscribe("sub")); |
| 290 | 292 |
| 291 EXPECT_FALSE(ExecuteOperation(multi_operation.Pass())); | 293 EXPECT_FALSE(ExecuteOperation(multi_operation.Pass())); |
| 292 } | 294 } |
| 293 | 295 |
| 294 } // namespace extensions | 296 } // namespace extensions |
| 295 | 297 |
| 296 // TODO(ckehoe): add tests for auth tokens and api key functionality | 298 // TODO(ckehoe): add tests for auth tokens and api key functionality |
| OLD | NEW |