Merge arc/common/settings.mojom into intent_helper.mojom

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index b280bc33865c682aaf4df2490cdb0b25d3055118..4b0cb9b0ae405cfca47a93a4204a9eaa42622bb4 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -35,7 +35,6 @@
 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/arc/arc_intent_helper_bridge.h"
-#include "chrome/browser/chromeos/arc/arc_settings_bridge.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
@@ -405,8 +404,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
       make_scoped_ptr(new arc::ArcIntentHelperBridge(
           arc_service_manager_->arc_bridge_service())));
   arc_service_manager_->AddService(make_scoped_ptr(
-      new arc::ArcSettingsBridge(arc_service_manager_->arc_bridge_service())));
-  arc_service_manager_->AddService(make_scoped_ptr(
       new arc::ArcVideoBridge(arc_service_manager_->arc_bridge_service(),
                               content::CreateArcVideoHostDelegate())));
   arc_service_manager_->arc_bridge_service()->DetectAvailability();