Switching to C++11 range-based for loops

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 13 matching lines @@
 namespace copresence {
 
 namespace {
 
 const char kChromeVersion[] = "Chrome Version String";
 
 void CreateSubscribedMessage(const std::vector<std::string>& subscription_ids,
                              const std::string& message_string,
                              SubscribedMessage* message_proto) {
   message_proto->mutable_published_message()->set_payload(message_string);
-  for (std::vector<std::string>::const_iterator subscription_id =
-           subscription_ids.begin();
-       subscription_id != subscription_ids.end();
-       ++subscription_id) {
-    message_proto->add_subscription_id(*subscription_id);
+  for (const std::string& subscription_id :subscription_ids) {

[rkc, 2014/10/01 03:48:32]

space after :

[Charlie, 2014/10/06 19:09:56]

Done.

+    message_proto->add_subscription_id(subscription_id);
   }
 }
 
 // TODO(ckehoe): Make DirectiveHandler an interface.
 class FakeDirectiveHandler : public DirectiveHandler {
  public:
   FakeDirectiveHandler() {}
   virtual ~FakeDirectiveHandler() {}
 
   const std::vector<Directive>& added_directives() const {
@@ skipping 158 matching lines @@
 TEST_F(RpcHandlerTest, ReportTokens) {
   std::vector<AudioToken> test_tokens;
   test_tokens.push_back(AudioToken("token 1", false));
   test_tokens.push_back(AudioToken("token 2", true));
   test_tokens.push_back(AudioToken("token 3", false));
   AddInvalidToken("token 2");
 
   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 =
+  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());
 }
 
 TEST_F(RpcHandlerTest, ReportResponseHandler) {
   // Fail on HTTP status != 200.
   ReportResponse empty_response;
   empty_response.mutable_header()->mutable_status()->set_code(OK);
@@ skipping 48 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