Revert of Reland "arc-bridge: Move most methods to Mojo interfaces"

chrome/browser/chromeos/arc/arc_settings_bridge_impl.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"
 
 #include <algorithm>
 
-#include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
-#include "components/arc/common/settings.mojom.h"
 
 namespace arc {
 
 namespace fontsizes {
 
 double ConvertFontSizeChromeToAndroid(int default_size,
                                       int default_fixed_size,
                                       int minimum_size) {
   // kWebKitDefaultFixedFontSize is automatically set to be 3 pixels smaller
   // than kWebKitDefaultFontSize when Chrome's settings page's main font
@@ skipping 60 matching lines @@
              pref_name == prefs::kWebKitDefaultFontSize ||
              pref_name == prefs::kWebKitMinimumFontSize) {
     SyncFontSize();
   } else {
     LOG(ERROR) << "Unknown pref changed.";
   }
 }
 
 void ArcSettingsBridgeImpl::OnStateChanged(ArcBridgeService::State state) {
   // ArcBridgeService::State::READY is emitted before ArcSettings app is ready
-  // to send broadcasts.  Instead we wait for the SettingsInstance to be ready.
+  // to send broadcasts.  Instead we wait for a later boot phase in
+  // OnInstanceBootPhase.
   if (state == ArcBridgeService::State::STOPPING) {
     StopObservingPrefChanges();
   }
 }
 
-void ArcSettingsBridgeImpl::OnSettingsInstanceReady() {
-  StartObservingPrefChanges();
-  SyncAllPrefs();
+void ArcSettingsBridgeImpl::OnInstanceBootPhase(InstanceBootPhase phase) {
+  if (phase == INSTANCE_BOOT_PHASE_ACTIVITY_MANAGER_READY) {
+    StartObservingPrefChanges();
+    SyncAllPrefs();
+  }
 }
 
 void ArcSettingsBridgeImpl::SyncSpokenFeedbackEnabled() const {
   const PrefService::Preference* pref = registrar_.prefs()->FindPreference(
       prefs::kAccessibilitySpokenFeedbackEnabled);
   DCHECK(pref);
   bool enabled = false;
   bool value_exists = pref->GetValue()->GetAsBoolean(&enabled);
   DCHECK(value_exists);
   base::DictionaryValue extras;
@@ skipping 28 matching lines @@
 void ArcSettingsBridgeImpl::SendSettingsBroadcast(
     const std::string& action,
     const base::DictionaryValue& extras) const {
   ArcBridgeService* bridge_service = ArcBridgeService::Get();
   if (!bridge_service ||
       bridge_service->state() != ArcBridgeService::State::READY) {
     LOG(ERROR) << "Bridge service is not ready.";
     return;
   }
 
-  std::string extras_json;
-  bool write_success = base::JSONWriter::Write(extras, &extras_json);
-  DCHECK(write_success);
-  bridge_service->settings_instance()->SendBroadcast(
-      action, "org.chromium.arc.settings",
-      "org.chromium.arc.settings.SettingsReceiver", extras_json);
+  bridge_service->SendBroadcast(action, "org.chromium.arc.settings",
+                                "org.chromium.arc.settings.SettingsReceiver",
+                                extras);
 }
 
 }  // namespace arc