Move MediaRouterUIService from c/b/ui/webui/m_r to c/b/ui/m_r

The UI Service is not specific to WebUI, so c/b/ui/media_router/ is a
more appropriate directory for it.

TBR=bauerb@chromium.org

Change-Id: I29b150969511a533bba1188f2466160537c28285
Reviewed-on: https://chromium-review.googlesource.com/1159381Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579993}

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -100,7 +100,7 @@
 #include "chrome/browser/resource_coordinator/local_site_characteristics_data_store_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/ui/media_router/media_router_ui_service_factory.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #endif
 

chrome/browser/ui/BUILD.gn

@@ -1383,6 +1383,10 @@ jumbo_split_static_library("ui") {
       "media_router/media_router_ui_base.h",
       "media_router/media_router_ui_helper.cc",
       "media_router/media_router_ui_helper.h",
+      "media_router/media_router_ui_service.cc",
+      "media_router/media_router_ui_service.h",
+      "media_router/media_router_ui_service_factory.cc",
+      "media_router/media_router_ui_service_factory.h",
       "media_router/media_sink_with_cast_modes.cc",
       "media_router/media_sink_with_cast_modes.h",
       "media_router/presentation_receiver_window.h",
@@ -1592,10 +1596,6 @@ jumbo_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/web_contents_display_observer.h",

chrome/browser/ui/media_router/media_router_dialog_controller_impl_base.cc

@@ -9,8 +9,8 @@
 #include "chrome/browser/media/router/presentation/presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/media_router/media_router_ui_base.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 
 using content::WebContents;
 

chrome/browser/ui/media_router/media_router_dialog_controller_impl_base.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/media/router/media_router_dialog_controller.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 
 class MediaRouterAction;
 

chrome/browser/ui/webui/media_router/media_router_ui_service.cc → chrome/browser/ui/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/ui/webui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/user_prefs/user_prefs.h"

chrome/browser/ui/webui/media_router/media_router_ui_service.h → chrome/browser/ui/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_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
-#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#define CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
 
 #include <memory>
 
@@ -58,4 +58,4 @@ class MediaRouterUIService : public KeyedService {
 
 }  // namespace media_router
 
-#endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_
+#endif  // CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_H_

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

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service_factory.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service_factory.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.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/ui/webui/media_router/media_router_ui_service_factory.h → chrome/browser/ui/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_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
@@ -48,4 +48,4 @@ class MediaRouterUIServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace media_router
 
-#endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_SERVICE_FACTORY_H_

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

@@ -8,10 +8,10 @@
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/test/mock_media_router.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service_factory.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/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"

chrome/browser/ui/toolbar/media_router_action.cc

@@ -14,12 +14,12 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/media_router/media_router_dialog_controller_impl_base.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "chrome/common/media_router/issue.h"
 #include "chrome/common/media_router/media_route.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc

@@ -13,13 +13,13 @@
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/extensions/browser_action_test_util.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service_factory.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
 #include "chrome/browser/ui/toolbar/mock_media_router_action_controller.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/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"

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

@@ -15,13 +15,13 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/browser_action_test_util.h"
 #include "chrome/browser/ui/media_router/media_router_dialog_controller_impl_base.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/views/media_router/app_menu_test_api.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui_service.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -311,7 +311,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
 #else
 #define MAYBE_OpenDialogsInMultipleTabs OpenDialogsInMultipleTabs
 #endif
-  
+
 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
                        MAYBE_OpenDialogsInMultipleTabs) {
   // Start with two tabs.

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

@@ -8,11 +8,11 @@
 #include "chrome/browser/media/router/test/test_helper.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/mock_media_router_action_controller.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_webui_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/ui/webui/media_router/media_router_web_ui_test.cc

@@ -6,11 +6,11 @@
 
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/test/mock_media_router.h"
+#include "chrome/browser/ui/media_router/media_router_ui_service.h"
+#include "chrome/browser/ui/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

@@ -3254,6 +3254,7 @@ test("unit_tests") {
       "../browser/ui/media_router/media_cast_mode_unittest.cc",
       "../browser/ui/media_router/media_router_file_dialog_unittest.cc",
       "../browser/ui/media_router/media_router_ui_helper_unittest.cc",
+      "../browser/ui/media_router/media_router_ui_service_factory_unittest.cc",
       "../browser/ui/media_router/query_result_manager_unittest.cc",
       "../browser/ui/passwords/manage_passwords_ui_controller_unittest.cc",
       "../browser/ui/toolbar/media_router_action_controller_unittest.cc",
@@ -3262,7 +3263,6 @@ test("unit_tests") {
       "../browser/ui/toolbar/mock_media_router_action_controller.cc",
       "../browser/ui/toolbar/mock_media_router_action_controller.h",
       "../browser/ui/webui/media_router/media_router_dialog_controller_webui_impl_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",