Use OnceCallback on Mojo interfaces in //chrome/common/media_router

chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc

 // Copyright 2017 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 "chrome/browser/media/router/discovery/dial/device_description_service.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/test/mock_callback.h"
 #include "chrome/browser/media/router/discovery/dial/device_description_fetcher.h"
 #include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
@@ skipping 49 matching lines @@
 
 }  // namespace
 
 namespace media_router {
 
 class TestSafeDialDeviceDescriptionParser
     : public SafeDialDeviceDescriptionParser {
  public:
   ~TestSafeDialDeviceDescriptionParser() override {}
 
-  MOCK_METHOD2(Start,
+  MOCK_METHOD2(StartMock,

[mark a. foltz, 2017/05/09 22:28:44]

s/StartMock/StartInternal/ for consistency with other code

[tzik, 2017/05/11 09:00:30]

Done.

                void(const std::string& xml_text,
-                    const DeviceDescriptionCallback& callback));
+                    DeviceDescriptionCallback& callback));
+  void Start(const std::string& xml_text, DeviceDescriptionCallback callback) {
+    StartMock(xml_text, callback);
+  }
 };
 
 class TestDeviceDescriptionService : public DeviceDescriptionService {
  public:
   TestDeviceDescriptionService(
       const DeviceDescriptionParseSuccessCallback& success_cb,
       const DeviceDescriptionParseErrorCallback& error_cb)
       : DeviceDescriptionService(success_cb, error_cb) {}
 
   MOCK_METHOD0(CreateSafeParser, SafeDialDeviceDescriptionParser*());
@@ skipping 94 matching lines @@
   std::vector<DialDeviceData> devices = {device_data};
 
   // Create Fetcher
   EXPECT_TRUE(fetcher_map_.empty());
   device_description_service()->GetDeviceDescriptions(
       devices, profile_.GetRequestContext());
   EXPECT_EQ(size_t(1), fetcher_map_.size());
 
   // Remove fetcher and create safe parser
   auto test_parser = base::MakeUnique<TestSafeDialDeviceDescriptionParser>();
-  EXPECT_CALL(*test_parser, Start(_, _));
+  EXPECT_CALL(*test_parser, StartMock(_, _));
 
   SetTestParser(std::move(test_parser));
   OnDeviceDescriptionFetchComplete(1);
 }
 
 TEST_F(DeviceDescriptionServiceTest, TestGetDeviceDescriptionFetchURLError) {
   DialDeviceData device_data = CreateDialDeviceData(1);
   std::vector<DialDeviceData> devices;
   devices.push_back(device_data);
 
@@ skipping 106 matching lines @@
   DialDeviceData device_data_2 = CreateDialDeviceData(2);
   DialDeviceData device_data_3 = CreateDialDeviceData(3);
 
   std::vector<DialDeviceData> devices = {device_data_1, device_data_2,
                                          device_data_3};
 
   // insert fetchers
   device_description_service()->GetDeviceDescriptions(
       devices, profile_.GetRequestContext());
   auto test_parser = base::MakeUnique<TestSafeDialDeviceDescriptionParser>();
-  EXPECT_CALL(*test_parser, Start(_, _)).Times(3);
+  EXPECT_CALL(*test_parser, StartMock(_, _)).Times(3);
 
   EXPECT_FALSE(device_description_service()->parser_);
   SetTestParser(std::move(test_parser));
   OnDeviceDescriptionFetchComplete(1);
 
   EXPECT_TRUE(device_description_service()->parser_);
   OnDeviceDescriptionFetchComplete(2);
   OnDeviceDescriptionFetchComplete(3);
 
   EXPECT_FALSE(device_description_service()->parser_);
 }
 
 }  // namespace media_router