[Mpris] Move MPRIS into ui/base

This CL removes MPRIS from components and moves it into ui/base.

Bug: 935624
Change-Id: Ie0bbf358a4df00e5e1b8905576c3e85ed7b29eab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1506465Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638342}

components/BUILD.gn

@@ -5,7 +5,6 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//components/mpris/features.gni")
 import("//components/nacl/features.gni")
 import("//components/ui_devtools/devtools.gni")
 import("//media/media_options.gni")
@@ -384,10 +383,6 @@ test("components_unittests") {
     ]
   }
 
-  if (use_mpris) {
-    deps += [ "//components/mpris:unit_tests" ]
-  }
-
   # No components should depend on Chrome.
   assert_no_deps = [ "//chrome/*" ]
 

ui/base/BUILD.gn

@@ -11,6 +11,7 @@ import("//build/config/ui.gni")
 import("//build/util/branding.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
+import("//ui/base/mpris/features.gni")
 import("//ui/base/ui_features.gni")
 import("//ui/ozone/ozone.gni")
 
@@ -1050,6 +1051,10 @@ test("ui_base_unittests") {
     ]
   }
 
+  if (use_mpris) {
+    deps += [ "//ui/base/mpris:unit_tests" ]
+  }
+
   if (is_chromeos) {
     deps += [
       "//chromeos",

components/mpris/BUILD.gn → ui/base/mpris/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
-import("//components/mpris/features.gni")
+import("//ui/base/mpris/features.gni")
 
 buildflag_header("buildflags") {
   header = "buildflags.h"

components/mpris/mpris_service.cc → ui/base/mpris/mpris_service.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mpris/mpris_service.h"
+#include "ui/base/mpris/mpris_service.h"
 
 #include <memory>
 #include <utility>
@@ -13,13 +13,13 @@
 #include "base/unguessable_token.h"
 #include "base/values.h"
 #include "components/dbus/dbus_thread_linux.h"
-#include "components/mpris/mpris_service_observer.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 #include "dbus/values_util.h"
+#include "ui/base/mpris/mpris_service_observer.h"
 
 namespace mpris {
 

components/mpris/mpris_service.h → ui/base/mpris/mpris_service.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 COMPONENTS_MPRIS_MPRIS_SERVICE_H_
-#define COMPONENTS_MPRIS_MPRIS_SERVICE_H_
+#ifndef UI_BASE_MPRIS_MPRIS_SERVICE_H_
+#define UI_BASE_MPRIS_MPRIS_SERVICE_H_
 
 #include <string>
 
@@ -137,4 +137,4 @@ class COMPONENT_EXPORT(MPRIS) MprisService {
 
 }  // namespace mpris
 
-#endif  // COMPONENTS_MPRIS_MPRIS_SERVICE_H_
+#endif  // UI_BASE_MPRIS_MPRIS_SERVICE_H_

components/mpris/mpris_service_observer.h → ui/base/mpris/mpris_service_observer.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 COMPONENTS_MPRIS_MPRIS_SERVICE_OBSERVER_H_
-#define COMPONENTS_MPRIS_MPRIS_SERVICE_OBSERVER_H_
+#ifndef UI_BASE_MPRIS_MPRIS_SERVICE_OBSERVER_H_
+#define UI_BASE_MPRIS_MPRIS_SERVICE_OBSERVER_H_
 
 #include "base/component_export.h"
 #include "base/observer_list_types.h"
@@ -29,4 +29,4 @@ class COMPONENT_EXPORT(MPRIS) MprisServiceObserver
 
 }  // namespace mpris
 
-#endif  // COMPONENTS_MPRIS_MPRIS_SERVICE_OBSERVER_H_
+#endif  // UI_BASE_MPRIS_MPRIS_SERVICE_OBSERVER_H_

components/mpris/mpris_service_unittest.cc → ui/base/mpris/mpris_service_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mpris/mpris_service.h"
+#include "ui/base/mpris/mpris_service.h"
 
 #include <memory>
 
@@ -11,12 +11,12 @@
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "components/dbus/dbus_thread_linux.h"
-#include "components/mpris/mpris_service_observer.h"
 #include "dbus/message.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_exported_object.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/mpris/mpris_service_observer.h"
 
 using ::testing::_;
 using ::testing::Invoke;