| Index: components/copresence/rpc/rpc_handler_unittest.cc
|
| diff --git a/components/copresence/rpc/rpc_handler_unittest.cc b/components/copresence/rpc/rpc_handler_unittest.cc
|
| index 77d61cb6f85f6d6a3aa3ad4974e7cba4b4103ab1..d636129855268276e8f3877c96ba99b65dfeb9f1 100644
|
| --- a/components/copresence/rpc/rpc_handler_unittest.cc
|
| +++ b/components/copresence/rpc/rpc_handler_unittest.cc
|
| @@ -68,7 +68,7 @@ class FakeDirectiveHandler : public DirectiveHandler {
|
|
|
| class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
|
| public:
|
| - RpcHandlerTest() : rpc_handler_(this), status_(SUCCESS), api_key_("API key") {
|
| + RpcHandlerTest() : rpc_handler_(this), status_(SUCCESS) {
|
| rpc_handler_.server_post_callback_ =
|
| base::Bind(&RpcHandlerTest::CaptureHttpPost, base::Unretained(this));
|
| rpc_handler_.device_id_ = "Device ID";
|
| @@ -77,9 +77,11 @@ class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
|
| void CaptureHttpPost(
|
| net::URLRequestContextGetter* url_context_getter,
|
| const std::string& rpc_name,
|
| + const std::string& app_id,
|
| scoped_ptr<MessageLite> request_proto,
|
| const RpcHandler::PostCleanupCallback& response_callback) {
|
| rpc_name_ = rpc_name;
|
| + app_id_ = app_id;
|
| request_proto_ = request_proto.Pass();
|
| }
|
|
|
| @@ -153,8 +155,16 @@ class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
|
| return kChromeVersion;
|
| }
|
|
|
| - virtual const std::string GetAPIKey() const override {
|
| - return api_key_;
|
| + virtual const std::string GetAPIKey(const std::string& app_id) const
|
| + override {
|
| + NOTREACHED();
|
| + return "";
|
| + }
|
| +
|
| + virtual const std::string GetAuthToken(const std::string& app_id) const
|
| + override {
|
| + NOTREACHED();
|
| + return "";
|
| }
|
|
|
| virtual WhispernetClient* GetWhispernetClient() override {
|
| @@ -167,9 +177,9 @@ class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
|
|
|
| RpcHandler rpc_handler_;
|
| CopresenceStatus status_;
|
| - std::string api_key_;
|
|
|
| std::string rpc_name_;
|
| + std::string app_id_;
|
| scoped_ptr<MessageLite> request_proto_;
|
| std::map<std::string, std::vector<Message>> messages_by_subscription_;
|
| };
|
| @@ -190,6 +200,7 @@ TEST_F(RpcHandlerTest, CreateRequestHeader) {
|
| "CreateRequestHeader App ID",
|
| StatusCallback());
|
| EXPECT_EQ(RpcHandler::kReportRequestRpcName, rpc_name_);
|
| + EXPECT_EQ("CreateRequestHeader App ID", app_id_);
|
| ReportRequest* report = static_cast<ReportRequest*>(request_proto_.get());
|
| EXPECT_EQ(kChromeVersion,
|
| report->header().framework_version().version_name());
|
| @@ -210,6 +221,7 @@ TEST_F(RpcHandlerTest, ReportTokens) {
|
|
|
| rpc_handler_.ReportTokens(test_tokens);
|
| EXPECT_EQ(RpcHandler::kReportRequestRpcName, rpc_name_);
|
| + EXPECT_EQ("", app_id_);
|
| ReportRequest* report = static_cast<ReportRequest*>(request_proto_.get());
|
| RepeatedPtrField<TokenObservation> tokens_sent =
|
| report->update_signals_request().token_observation();
|
|
|