Get rid of sync_preferences::SyncedPrefObserver inheritance.

chrome/browser/chromeos/arc/arc_session_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
@@ skipping 399 matching lines @@
   if (!g_disable_ui_for_testing && !IsArcOptInVerificationDisabled() &&
       !IsArcKioskMode()) {
     DCHECK(!support_host_);
     support_host_ = base::MakeUnique<ArcSupportHost>(profile_);
     support_host_->AddObserver(this);
   }
 
   DCHECK_EQ(State::NOT_INITIALIZED, state_);
   SetState(State::STOPPED);
 
-  PrefServiceSyncableFromProfile(profile_)->AddSyncedPrefObserver(
-      prefs::kArcEnabled, this);
-
   context_.reset(new ArcAuthContext(profile_));
 
   if (!g_disable_ui_for_testing ||
       g_enable_check_android_management_for_testing) {
     ArcAndroidManagementChecker::StartClient();
   }
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kArcEnabled,
       base::Bind(&ArcSessionManager::OnOptInPreferenceChanged,
@@ skipping 14 matching lines @@
   }
 }
 
 void ArcSessionManager::OnIsSyncingChanged() {
   sync_preferences::PrefServiceSyncable* const pref_service_syncable =
       PrefServiceSyncableFromProfile(profile_);
   if (!pref_service_syncable->IsSyncing())
     return;
 
   pref_service_syncable->RemoveObserver(this);
-
-  if (IsArcEnabled())

[hidehiko, 2017/02/07 14:05:37]

Note: according to
https://codereview.chromium.org/1854463002/diff/1/chrome/browser/chromeos/arc...,
this was workaround when we're using sync pref. Though, now we are using
non-sync one, so we should be able to drop this safely.

-    OnOptInPreferenceChanged();
-
   if (!g_disable_ui_for_testing &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableArcOOBEOptIn) &&
       profile_->IsNewProfile() &&
       !profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
     ArcAuthNotification::Show(profile_);
   }
 }
 
 void ArcSessionManager::Shutdown() {
   if (!g_disable_ui_for_testing)
     ArcAuthNotification::Hide();
 
   ShutdownSession();
   if (support_host_) {
     support_host_->Close();
     support_host_->RemoveObserver(this);
     support_host_.reset();
   }
   if (profile_) {
     sync_preferences::PrefServiceSyncable* pref_service_syncable =
         PrefServiceSyncableFromProfile(profile_);
     pref_service_syncable->RemoveObserver(this);
-    pref_service_syncable->RemoveSyncedPrefObserver(prefs::kArcEnabled, this);
   }
   pref_change_registrar_.RemoveAll();
   context_.reset();
   profile_ = nullptr;
   SetState(State::NOT_INITIALIZED);
 }
 
-void ArcSessionManager::OnSyncedPrefChanged(const std::string& path,
-                                            bool from_sync) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  // Update UMA only for local changes
-  if (!from_sync) {
-    const bool arc_enabled =
-        profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled);
-    UpdateOptInActionUMA(arc_enabled ? OptInActionType::OPTED_IN
-                                     : OptInActionType::OPTED_OUT);
-
-    if (!arc_enabled && !IsArcManaged()) {
-      ash::ShelfDelegate* shelf_delegate = GetShelfDelegate();
-      if (shelf_delegate)
-        shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
-    }
-  }
-}
-
 void ArcSessionManager::StopArc() {
   if (state_ != State::STOPPED) {
     profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, false);
     profile_->GetPrefs()->SetBoolean(prefs::kArcTermsAccepted, false);
   }
   ShutdownSession();
   if (support_host_)
     support_host_->Close();
 }
 
 void ArcSessionManager::OnOptInPreferenceChanged() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile_);
 
-  // TODO(dspaid): Move code from OnSyncedPrefChanged into this method.
-  OnSyncedPrefChanged(prefs::kArcEnabled, IsArcManaged());
+  const bool arc_enabled = IsArcEnabled();
+  if (!IsArcManaged()) {
+    // Update UMA only for non-Managed cases.
+    UpdateOptInActionUMA(arc_enabled ? OptInActionType::OPTED_IN
+                                     : OptInActionType::OPTED_OUT);
 
-  const bool arc_enabled = IsArcEnabled();
+    if (!arc_enabled) {
+      // Remove the pinned Play Store icon launcher in Shelf.
+      // This is only for non-Managed cases. In managed cases, it is expected
+      // to be "disabled" rather than "removed", so keep it here.
+      ash::ShelfDelegate* shelf_delegate = GetShelfDelegate();
+      if (shelf_delegate)
+        shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
+    }
+  }
+
   for (auto& observer : observer_list_)
     observer.OnArcOptInChanged(arc_enabled);
 
   // Hide auth notification if it was opened before and arc.enabled pref was
   // explicitly set to true or false.
   if (!g_disable_ui_for_testing &&
       profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
     ArcAuthNotification::Hide();
   }
 
@@ skipping 439 matching lines @@
       return os << "ACTIVE";
   }
 
   // Some compiler reports an error even if all values of an enum-class are
   // covered indivisually in a switch statement.
   NOTREACHED();
   return os;
 }
 
 }  // namespace arc