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/values.h" | 6 #include "base/values.h" |
7 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 7 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
8 #include "chrome/browser/extensions/extension_api_unittest.h" | 8 #include "chrome/browser/extensions/extension_api_unittest.h" |
9 #include "chrome/browser/extensions/extension_function_test_utils.h" | 9 #include "chrome/browser/extensions/extension_function_test_utils.h" |
10 #include "components/copresence/proto/data.pb.h" | 10 #include "components/copresence/proto/data.pb.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 using api::copresence::UnpublishOperation; | 36 using api::copresence::UnpublishOperation; |
37 using api::copresence::UnsubscribeOperation; | 37 using api::copresence::UnsubscribeOperation; |
38 | 38 |
39 | 39 |
40 PublishOperation* CreatePublish(const std::string& id) { | 40 PublishOperation* CreatePublish(const std::string& id) { |
41 PublishOperation* publish = new PublishOperation; | 41 PublishOperation* publish = new PublishOperation; |
42 | 42 |
43 publish->id = id; | 43 publish->id = id; |
44 publish->time_to_live_millis.reset(new int(1000)); | 44 publish->time_to_live_millis.reset(new int(1000)); |
45 publish->message.type = "joke"; | 45 publish->message.type = "joke"; |
46 publish->message.payload = "Knock Knock!"; | 46 std::string payload("Knock Knock!"); |
| 47 publish->message.payload.assign(payload.begin(), payload.end()); |
47 | 48 |
48 return publish; | 49 return publish; |
49 } | 50 } |
50 | 51 |
51 SubscribeOperation* CreateSubscribe(const std::string& id) { | 52 SubscribeOperation* CreateSubscribe(const std::string& id) { |
52 SubscribeOperation* subscribe = new SubscribeOperation; | 53 SubscribeOperation* subscribe = new SubscribeOperation; |
53 | 54 |
54 subscribe->id = id; | 55 subscribe->id = id; |
55 subscribe->time_to_live_millis.reset(new int(1000)); | 56 subscribe->time_to_live_millis.reset(new int(1000)); |
56 subscribe->filter.type = "joke"; | 57 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); | 288 scoped_ptr<Operation> multi_operation(new Operation); |
288 multi_operation->publish.reset(CreatePublish("pub")); | 289 multi_operation->publish.reset(CreatePublish("pub")); |
289 multi_operation->subscribe.reset(CreateSubscribe("sub")); | 290 multi_operation->subscribe.reset(CreateSubscribe("sub")); |
290 | 291 |
291 EXPECT_FALSE(ExecuteOperation(multi_operation.Pass())); | 292 EXPECT_FALSE(ExecuteOperation(multi_operation.Pass())); |
292 } | 293 } |
293 | 294 |
294 } // namespace extensions | 295 } // namespace extensions |
295 | 296 |
296 // TODO(ckehoe): add tests for auth tokens and api key functionality | 297 // TODO(ckehoe): add tests for auth tokens and api key functionality |
OLD | NEW |