arc_bridge: Add more logging, plus cleanup

chrome/browser/chromeos/arc/arc_auth_service.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_auth_service.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
@@ skipping 200 matching lines @@
 }
 
 void ArcAuthService::OnPrimaryUserProfilePrepared(Profile* profile) {
   DCHECK(profile && profile != profile_);
   DCHECK(thread_checker.Get().CalledOnValidThread());
 
   Shutdown();
 
   user_manager::User const* const user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
-  if (profile->IsLegacySupervised() || !user->HasGaiaAccount()) {
-    VLOG(2) << "Supervised users and users without GAIA accounts are not "
-               "supported in Arc.";
+  if (profile->IsLegacySupervised()) {
+    VLOG(1) << "Supervised users are not supported in ARC.";
+    return;
+  }
+  if (!user->HasGaiaAccount()) {
+    VLOG(1) << "Users without GAIA accounts are not supported in ARC.";
     return;
   }
 
   profile_ = profile;
   PrefServiceSyncableFromProfile(profile_)->AddSyncedPrefObserver(
       prefs::kArcEnabled, this);
 
   // Reuse storage used in ARC OptIn platform app.
   const std::string site_url =
       base::StringPrintf("%s://%s/persist?%s", content::kGuestScheme,
@@ skipping 110 matching lines @@
     UpdateOptInActionUMA(profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)
                              ? OptInActionType::OPTED_IN
                              : OptInActionType::OPTED_OUT);
   }
 }
 
 void ArcAuthService::OnOptInPreferenceChanged() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
 
-  if (profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)) {
-    if (state_ != State::ACTIVE) {
-      CloseUI();
-      auth_code_.clear();
-
-      if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) {
-        // Need pre-fetch auth code and show OptIn UI if needed.
-        initial_opt_in_ = true;
-        StartUI();
-      } else {
-        // Ready to start Arc.
-        StartArc();
-      }
-
-      UpdateEnabledStateUMA(true);
-    }
-  } else {
+  if (!profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)) {
     if (state_ != State::STOPPED)
       UpdateEnabledStateUMA(false);
     ShutdownBridgeAndCloseUI();
+    return;
   }
+
+  if (state_ == State::ACTIVE)
+    return;
+  CloseUI();
+  auth_code_.clear();
+
+  if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) {
+    // Need pre-fetch auth code and show OptIn UI if needed.
+    initial_opt_in_ = true;
+    StartUI();
+  } else {
+    // Ready to start Arc.
+    StartArc();
+  }
+
+  UpdateEnabledStateUMA(true);
 }
 
 void ArcAuthService::ShutdownBridge() {
   playstore_launcher_.reset();
   auth_callback_.reset();
   ubertoken_fethcher_.reset();
   merger_fetcher_.reset();
   arc_bridge_service()->Shutdown();
   SetState(State::STOPPED);
 }
@@ skipping 144 matching lines @@
       return os << kStateFetchingCode;
     case ArcAuthService::State::ACTIVE:
       return os << kStateActive;
     default:
       NOTREACHED();
       return os;
   }
 }
 
 }  // namespace arc