Fixing memory leak in TimedMap

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 157 matching lines @@
   base::MessageLoop message_loop_;
 
   RpcHandler rpc_handler_;
 
   std::string rpc_name_;
   scoped_ptr<MessageLite> request_proto_;
   CopresenceStatus status_;
   std::map<std::string, std::vector<Message> > messages_by_subscription_;
 };
 
-// TODO(ckehoe): Renable these after https://codereview.chromium.org/453203002/
-// lands.
-#define MAYBE_Initialize DISABLED_Initialize
-
-TEST_F(RpcHandlerTest, MAYBE_Initialize) {
+TEST_F(RpcHandlerTest, Initialize) {
   SetDeviceId("");
   rpc_handler_.Initialize(RpcHandler::SuccessCallback());
   RegisterDeviceRequest* registration =
       static_cast<RegisterDeviceRequest*>(request_proto_.get());
   Identity identity = registration->device_identifiers().registrant();
   EXPECT_EQ(CHROME, identity.type());
   EXPECT_FALSE(identity.chrome_id().empty());
 }
 
 // TODO(ckehoe): Fix this on Windows. See rpc_handler.cc.
 #ifndef OS_WIN
 
-// TODO(ckehoe): Renable these after https://codereview.chromium.org/453203002/
-// lands.
-#define MAYBE_GetDeviceCapabilities DISABLED_GetDeviceCapabilities
-
-TEST_F(RpcHandlerTest, MAYBE_GetDeviceCapabilities) {
+TEST_F(RpcHandlerTest, GetDeviceCapabilities) {
   // Empty request.
   rpc_handler_.SendReportRequest(make_scoped_ptr(new ReportRequest));
   EXPECT_EQ(RpcHandler::kReportRequestRpcName, rpc_name_);
   const TokenTechnology* token_technology = &GetTokenTechnologyFromReport();
   EXPECT_EQ(AUDIO_ULTRASOUND_PASSBAND, token_technology->medium());
   EXPECT_EQ(TRANSMIT, token_technology->instruction_type(0));
   EXPECT_EQ(RECEIVE, token_technology->instruction_type(1));
 
   // Request with broadcast only.
   scoped_ptr<ReportRequest> report(new ReportRequest);
@@ skipping 26 matching lines @@
   report.reset(new ReportRequest);
   AddMessageWithStrategy(report.get(), SCAN_ONLY);
   AddSubscriptionWithStrategy(report.get(), BROADCAST_AND_SCAN);
   rpc_handler_.SendReportRequest(report.Pass());
   token_technology = &GetTokenTechnologyFromReport();
   EXPECT_EQ(TRANSMIT, token_technology->instruction_type(0));
   EXPECT_EQ(RECEIVE, token_technology->instruction_type(1));
 }
 #endif
 
-// TODO(ckehoe): Renable these after https://codereview.chromium.org/453203002/
-// lands.
-#define MAYBE_CreateRequestHeader DISABLED_CreateRequestHeader
-
-TEST_F(RpcHandlerTest, MAYBE_CreateRequestHeader) {
+TEST_F(RpcHandlerTest, CreateRequestHeader) {
   SetDeviceId("CreateRequestHeader Device ID");
   rpc_handler_.SendReportRequest(make_scoped_ptr(new ReportRequest),
                                  "CreateRequestHeader App ID",
                                  StatusCallback());
   EXPECT_EQ(RpcHandler::kReportRequestRpcName, rpc_name_);
   ReportRequest* report = static_cast<ReportRequest*>(request_proto_.get());
   EXPECT_TRUE(report->header().has_framework_version());
   EXPECT_EQ("CreateRequestHeader App ID",
             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) {
+TEST_F(RpcHandlerTest, ReportTokens) {
   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(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/
-// lands.
-#define MAYBE_ReportResponseHandler DISABLED_ReportResponseHandler
-
-TEST_F(RpcHandlerTest, MAYBE_ReportResponseHandler) {
+TEST_F(RpcHandlerTest, ReportResponseHandler) {
   // Fail on HTTP status != 200.
   ReportResponse empty_response;
   empty_response.mutable_header()->mutable_status()->set_code(OK);
   std::string serialized_empty_response;
   ASSERT_TRUE(empty_response.SerializeToString(&serialized_empty_response));
   status_ = SUCCESS;
   InvokeReportResponseHandler(net::HTTP_BAD_REQUEST, serialized_empty_response);
   EXPECT_EQ(FAIL, status_);
 
   std::vector<std::string> subscription_1(1, "Subscription 1");
@@ skipping 41 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