Move MediaRouterUIService files to chrome/browser/ui/

Move media_router_ui_service(.h|.cc), media_router_ui_service_factory(.h|.cc)
and media_router_ui_service_factory_unittest.cc from
chrome/browser/media/router/ to chrome/browser/ui/webui/media_router/

BUG=646627
Signed-off-by: zhuoyu.qian <zhuoyu.qian@samsung.com>
Change-Id: I4bb61a4f09a1806ca1f3658fc19747c6c669c284
Reviewed-on: https://chromium-review.googlesource.com/786950Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522015}

chrome/browser/media/router/BUILD.gn

@@ -69,13 +69,6 @@ static_library("router") {
       "event_page_request_manager.h",
       "event_page_request_manager_factory.cc",
       "event_page_request_manager_factory.h",
-
-      # TODO(crbug.com/646627): Move media_router_ui_service* to
-      # chrome/browser/ui/.
-      "media_router_ui_service.cc",
-      "media_router_ui_service.h",
-      "media_router_ui_service_factory.cc",
-      "media_router_ui_service_factory.h",
       "mojo/extension_media_route_provider_proxy.cc",
       "mojo/extension_media_route_provider_proxy.h",
       "mojo/media_route_controller.cc",

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -90,9 +90,9 @@
 #include "chrome/browser/android/search_permissions/search_permissions_service.h"
 #else
 #include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h"
-#include "chrome/browser/media/router/media_router_ui_service_factory.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #endif
 

chrome/browser/ui/BUILD.gn

@@ -1022,6 +1022,10 @@ split_static_library("ui") {
       "webui/media_router/media_router_resources_provider.h",
       "webui/media_router/media_router_ui.cc",
       "webui/media_router/media_router_ui.h",
+      "webui/media_router/media_router_ui_service.cc",
+      "webui/media_router/media_router_ui_service.h",
+      "webui/media_router/media_router_ui_service_factory.cc",
+      "webui/media_router/media_router_ui_service_factory.h",
       "webui/media_router/media_router_webui_message_handler.cc",
       "webui/media_router/media_router_webui_message_handler.h",
       "webui/media_router/media_sink_with_cast_modes.cc",

chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

@@ -7,7 +7,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
-#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/browser/ui/browser.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"

chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

@@ -12,7 +12,6 @@
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "chrome/common/url_constants.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"

chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/media/router/test_helper.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -13,6 +12,7 @@
 #include "chrome/browser/ui/toolbar/mock_media_router_action_controller.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/media/router/media_router_ui_service.cc → chrome/browser/ui/webui/media_router/media_router_ui_service.cc

@@ -2,11 +2,11 @@
 // 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/media_router_ui_service.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 
 #include "chrome/browser/media/router/media_router_feature.h"
-#include "chrome/browser/media/router/media_router_ui_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
 
 namespace media_router {
 

chrome/browser/media/router/media_router_ui_service.h → chrome/browser/ui/webui/media_router/media_router_ui_service.h

 // Copyright 2016 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.
-
-#ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
 
 #include <memory>
 
@@ -38,4 +37,4 @@ class MediaRouterUIService : public KeyedService {
 
 }  // namespace media_router
 
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_

chrome/browser/media/router/media_router_ui_service_factory.cc → chrome/browser/ui/webui/media_router/media_router_ui_service_factory.cc

@@ -2,12 +2,12 @@
 // 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/media_router_ui_service_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
 
 #include "chrome/browser/media/router/media_router_factory.h"
-#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 using content::BrowserContext;

chrome/browser/media/router/media_router_ui_service_factory.h → chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
@@ -44,4 +44,4 @@ class MediaRouterUIServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace media_router
 
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_

chrome/browser/media/router/media_router_ui_service_factory_unittest.cc → chrome/browser/ui/webui/media_router/media_router_ui_service_factory_unittest.cc

@@ -4,11 +4,11 @@
 
 #include <memory>
 
-#include "chrome/browser/media/router/media_router_ui_service.h"
-#include "chrome/browser/media/router/media_router_ui_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ui/webui/media_router/media_router_web_ui_test.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
 
 #include "base/memory/ptr_util.h"
-#include "chrome/browser/media/router/media_router_ui_service.h"
-#include "chrome/browser/media/router/media_router_ui_service_factory.h"
 #include "chrome/browser/ui/toolbar/mock_media_router_action_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
 #include "chrome/test/base/dialog_test_browser_window.h"
 
 class MockMediaRouterUIService : public media_router::MediaRouterUIService {

chrome/test/BUILD.gn

@@ -2933,10 +2933,6 @@ test("unit_tests") {
       "../browser/media/router/event_page_request_manager_unittest.cc",
       "../common/media_router/discovery/media_sink_internal_unittest.cc",
       "../common/media_router/discovery/media_sink_service_base_unittest.cc",
-
-      # TODO(crbug.com/646627):
-      # Move media_router_ui_service_factory_unittest.cc to chrome/browser/ui.
-      "../browser/media/router/media_router_ui_service_factory_unittest.cc",
       "../browser/media/router/mojo/extension_media_route_provider_proxy_unittest.cc",
       "../browser/media/router/mojo/media_route_controller_unittest.cc",
       "../browser/media/router/mojo/media_router_desktop_unittest.cc",
@@ -2958,6 +2954,7 @@ test("unit_tests") {
       "../browser/ui/webui/media_router/media_cast_mode_unittest.cc",
       "../browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc",
       "../browser/ui/webui/media_router/media_router_file_dialog_unittest.cc",
+      "../browser/ui/webui/media_router/media_router_ui_service_factory_unittest.cc",
       "../browser/ui/webui/media_router/media_router_ui_unittest.cc",
       "../browser/ui/webui/media_router/media_router_web_ui_test.cc",
       "../browser/ui/webui/media_router/media_router_web_ui_test.h",