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

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

Index: chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc
diff --git a/chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc b/chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc
index cebbd6b68a56d8658d39c3088bcf0db80ccf7d64..357a0182d7f8294f281b6356cf3235dec6a2be7d 100644
--- a/chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc
+++ b/chrome/browser/media/router/discovery/dial/device_description_service_unittest.cc
@@ -67,9 +67,12 @@ class TestSafeDialDeviceDescriptionParser
  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 {
@@ -184,7 +187,7 @@ TEST_F(DeviceDescriptionServiceTest, TestGetDeviceDescriptionFetchURL) {
 
   // 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);
@@ -311,7 +314,7 @@ TEST_F(DeviceDescriptionServiceTest, TestSafeParserProperlyCreated) {
   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));