Fixing Windows build

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 90 matching lines @@
   }
 
   void CaptureStatus(CopresenceStatus status) {
     status_ = status;
   }
 
   inline const ReportRequest* GetReportSent() {
     return static_cast<ReportRequest*>(request_proto_.get());
   }
 
-// TODO(ckehoe): Fix this on Windows. See rpc_handler.cc.
-#ifndef OS_WIN
   const TokenTechnology& GetTokenTechnologyFromReport() {
     return GetReportSent()->update_signals_request().state().capabilities()
         .token_technology(0);
   }
-#endif
 
   const RepeatedPtrField<PublishedMessage>& GetMessagesPublished() {
     return GetReportSent()->manage_messages_request().message_to_publish();
   }
 
   const RepeatedPtrField<Subscription>& GetSubscriptionsSent() {
     return GetReportSent()->manage_subscriptions_request().subscription();
   }
 
   void SetDeviceId(const std::string& device_id) {
@@ skipping 69 matching lines @@
 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
-
 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.
@@ skipping 27 matching lines @@
 
   // Request with broadcast and scan.
   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
 
 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_EQ(kChromeVersion,
             report->header().framework_version().version_name());
@@ skipping 77 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