[Device Discovery] Move files from browser/extensions/api/dial to browser/media/router/discovery/di…

chrome/browser/extensions/api/dial/dial_api.cc

Index: chrome/browser/extensions/api/dial/dial_api.cc
diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc
index e97f90fa0b260780ad189b0ce32a5c585dd4c248..415ae15dce5e13b6b05ebc49be296b64fb4c74cd 100644
--- a/chrome/browser/extensions/api/dial/dial_api.cc
+++ b/chrome/browser/extensions/api/dial/dial_api.cc
@@ -11,8 +11,8 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
-#include "chrome/browser/extensions/api/dial/device_description_fetcher.h"
 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"
+#include "chrome/browser/media/router/discovery/dial/device_description_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/dial.h"
 #include "content/public/browser/browser_thread.h"
@@ -22,10 +22,10 @@
 
 using base::TimeDelta;
 using content::BrowserThread;
-using extensions::api::dial::DeviceDescriptionFetcher;
-using extensions::api::dial::DialDeviceData;
-using extensions::api::dial::DialDeviceDescriptionData;
-using extensions::api::dial::DialRegistry;
+using media_router::DeviceDescriptionFetcher;
+using media_router::DialDeviceData;
+using media_router::DialDeviceDescriptionData;
+using media_router::DialRegistry;
 
 namespace extensions {
 
@@ -92,6 +92,17 @@ void DialAPI::NotifyListenerRemovedOnIOThread() {
   dial_registry()->OnListenerRemoved();
 }
 
+void DialAPI::FillDialDevice(const media_router::DialDeviceData& device_data,
+                             api::dial::DialDevice* device) const {
+  DCHECK(!device_data.device_id().empty());
+  DCHECK(media_router::DialDeviceData::IsDeviceDescriptionUrl(
+      device_data.device_description_url()));
+  device->device_label = device_data.label();
+  device->device_description_url = device_data.device_description_url().spec();
+  if (device_data.has_config_id())
+    device->config_id.reset(new int(device_data.config_id()));
+}
+
 void DialAPI::OnDialDeviceEvent(const DialRegistry::DeviceList& devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ -110,7 +121,7 @@ void DialAPI::SendEventOnUIThread(const DialRegistry::DeviceList& devices) {
   std::vector<api::dial::DialDevice> args;
   for (const DialDeviceData& device : devices) {
     api::dial::DialDevice api_device;
-    device.FillDialDevice(&api_device);
+    FillDialDevice(device, &api_device);
     args.push_back(std::move(api_device));
   }
   std::unique_ptr<base::ListValue> results =
@@ -157,8 +168,8 @@ void DialAPI::SendErrorOnUIThread(const DialRegistry::DialErrorCode code) {
 void DialAPI::ShutdownOnUIThread() {}
 
 void DialAPI::SetDeviceForTest(
-    const api::dial::DialDeviceData& device_data,
-    const api::dial::DialDeviceDescriptionData& device_description) {
+    const media_router::DialDeviceData& device_data,
+    const media_router::DialDeviceDescriptionData& device_description) {
   test_device_data_ = base::MakeUnique<DialDeviceData>(device_data);
   test_device_description_ =
       base::MakeUnique<DialDeviceDescriptionData>(device_description);
@@ -240,7 +251,7 @@ void DialFetchDeviceDescriptionFunction::MaybeStartFetch(const GURL& url) {
 }
 
 void DialFetchDeviceDescriptionFunction::OnFetchComplete(
-    const api::dial::DialDeviceDescriptionData& result) {
+    const media_router::DialDeviceDescriptionData& result) {
   // Destroy the DeviceDescriptionFetcher since it still contains a reference
   // to |this| in its un-invoked callback.
   device_description_fetcher_.reset();