Improve audible token detection.

components/copresence/rpc/rpc_handler_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 "components/copresence/rpc/rpc_handler.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 248 matching lines @@
             report->header().client_version().client());
   EXPECT_EQ("CreateRequestHeader Device ID",
             report->header().registered_device_id());
 }
 
 // TODO(ckehoe): Renable these after https://codereview.chromium.org/453203002/
 // lands.
 #define MAYBE_ReportTokens DISABLED_ReportTokens
 
 TEST_F(RpcHandlerTest, MAYBE_ReportTokens) {
-  std::vector<std::string> test_tokens;
-  test_tokens.push_back("token 1");
-  test_tokens.push_back("token 2");
-  test_tokens.push_back("token 3");
+  std::vector<FullToken> test_tokens;
+  test_tokens.push_back(FullToken("token 1", false));
+  test_tokens.push_back(FullToken("token 2", true));
+  test_tokens.push_back(FullToken("token 3", false));
   AddInvalidToken("token 2");
 
-  rpc_handler_.ReportTokens(AUDIO_ULTRASOUND_PASSBAND, test_tokens);
+  rpc_handler_.ReportTokens(test_tokens);
   EXPECT_EQ(RpcHandler::kReportRequestRpcName, rpc_name_);
   ReportRequest* report = static_cast<ReportRequest*>(request_proto_.get());
   google::protobuf::RepeatedPtrField<TokenObservation> tokens_sent =
       report->update_signals_request().token_observation();
   ASSERT_EQ(2, tokens_sent.size());
   EXPECT_EQ("token 1", tokens_sent.Get(0).token_id());
   EXPECT_EQ("token 3", tokens_sent.Get(1).token_id());
 }
 
 // TODO(ckehoe): Renable these after https://codereview.chromium.org/453203002/
@@ skipping 55 matching lines @@
             messages_by_subscription_["Subscription 2"][1].payload());
 
   ASSERT_EQ(2U, directive_handler->added_directives().size());
   EXPECT_EQ("Subscription 1",
             directive_handler->added_directives()[0].subscription_id());
   EXPECT_EQ("Subscription 2",
             directive_handler->added_directives()[1].subscription_id());
 }
 
 }  // namespace copresence