Expand Chrome OS ARC support to create one tree source per package

chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc

Index: chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
index f6c9b3e414aedffc620a40a920de97a34ec93b9a..8e4b7fc43873e3ea5641225f356f6e6f4d770d0c 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
@@ -498,39 +498,9 @@ void ArcSettingsServiceImpl::SyncReportingConsent() const {
 }
 
 void ArcSettingsServiceImpl::SyncSpokenFeedbackEnabled() const {
-  // Chrome spoken feedback triggers enabling of Android spoken feedback.
-  // There are two types of spoken feedback from Android:
-  // 1. Talkback (default)
-  // 2. accessibility helper (experimental, works through ChromeVox).
-  // These two features are mutually exclusive.
-
-  const PrefService::Preference* pref = registrar_.prefs()->FindPreference(
-      prefs::kAccessibilitySpokenFeedbackEnabled);
-  DCHECK(pref);
-  bool enabled = false;
-  bool value_exists = pref->GetValue()->GetAsBoolean(&enabled);
-  CHECK(value_exists);
-  bool managed =
-      IsBooleanPrefManaged(prefs::kAccessibilitySpokenFeedbackEnabled);
-
-  std::string talkback_setting =
-      "org.chromium.arc.intent_helper.SET_SPOKEN_FEEDBACK_ENABLED";
-  std::string accessibility_helper_setting =
-      "org.chromium.arc.intent_helper.SET_ACCESSIBILITY_HELPER_ENABLED";
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableChromeVoxArcSupport)) {
-    // Make sure if ChromeVox is on, TalkBack is off.
-    if (enabled)
-      SendBoolValueSettingsBroadcast(false, managed, talkback_setting);
-
-    SendBoolValueSettingsBroadcast(enabled, managed,
-                                   accessibility_helper_setting);
-
-    return;
-  }
-
-  SendBoolValueSettingsBroadcast(enabled, managed, talkback_setting);
+  SendBoolPrefSettingsBroadcast(

[Luis Héctor Chávez, 2017/04/25 15:27:00]

Do you need to disable the accessibility helper unconditionally? What will
happen when a user that had it enabled updates to this version? Wouldn't both be
enabled?

+      prefs::kAccessibilitySpokenFeedbackEnabled,
+      "org.chromium.arc.intent_helper.SET_SPOKEN_FEEDBACK_ENABLED");
 }
 
 void ArcSettingsServiceImpl::SyncTimeZone() const {