| Index: chrome/browser/media/router/discovery/dial/dial_device_data_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/dial/dial_device_data_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_device_data_unittest.cc
|
| similarity index 80%
|
| rename from chrome/browser/extensions/api/dial/dial_device_data_unittest.cc
|
| rename to chrome/browser/media/router/discovery/dial/dial_device_data_unittest.cc
|
| index fc079a37cd03871a4bc0c7cb1653b4b7ec5f54f6..ac78065d38f7fffa14e49a51ded7999686ed497e 100644
|
| --- a/chrome/browser/extensions/api/dial/dial_device_data_unittest.cc
|
| +++ b/chrome/browser/media/router/discovery/dial/dial_device_data_unittest.cc
|
| @@ -2,13 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/extensions/api/dial/dial_device_data.h"
|
| -#include "chrome/common/extensions/api/dial.h"
|
| +#include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace extensions {
|
| -namespace api {
|
| -namespace dial {
|
| +namespace media_router {
|
|
|
| namespace {
|
|
|
| @@ -24,22 +21,6 @@ void ExpectEqual(const DialDeviceData& first, const DialDeviceData& second) {
|
|
|
| } // namespace
|
|
|
| -TEST(DialDeviceDataTest, TestFillDialDevice) {
|
| - api::dial::DialDevice api_device;
|
| -
|
| - DialDeviceData device;
|
| - device.set_device_id("device");
|
| - device.set_label("label");
|
| - device.set_device_description_url(GURL("http://127.0.0.1/dd.xml"));
|
| - device.set_config_id(1);
|
| -
|
| - device.FillDialDevice(&api_device);
|
| - EXPECT_EQ(api_device.device_label, device.label());
|
| - EXPECT_EQ(api_device.device_description_url,
|
| - device.device_description_url().spec());
|
| - EXPECT_EQ(*(api_device.config_id), device.config_id());
|
| -}
|
| -
|
| TEST(DialDeviceDataTest, TestUpdateFrom) {
|
| DialDeviceData original;
|
| original.set_device_id("device_a");
|
| @@ -103,6 +84,4 @@ TEST(DialDeviceDataTest, TestIsDeviceDescriptionUrl) {
|
| DialDeviceData::IsDeviceDescriptionUrl(GURL("file://path/to/file")));
|
| }
|
|
|
| -} // namespace dial
|
| -} // namespace api
|
| -} // namespace extensions
|
| +} // namespace media_router
|
|
|