easy_unlock: When loading the easy-unlock app, make sure it's enabled

chrome/browser/signin/easy_unlock_service.cc

 // Copyright 2014 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/signin/easy_unlock_service.h"
 
+#include <string>

[Tim Song, 2014/09/15 23:53:53]

Why do you need this?

[tbarzic, 2014/09/16 00:05:02]

just fixing error reported by git cl lint (we use string in the file, but don't
include it)

+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 102 matching lines @@
   }
 
   virtual ~PowerMonitor() {
     chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
         RemoveObserver(this);
   }
 
  private:
   // chromeos::PowerManagerClient::Observer:
   virtual void SuspendImminent() OVERRIDE {
-    service_->DisableApp();
+    service_->DisableAppIfLoaded();
     service_->screenlock_state_handler_.reset();
   }
 
   virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE {
     service_->LoadApp();
   }
 
   EasyUnlockService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
@@ skipping 208 matching lines @@
   if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) {
     easy_unlock_path =
         command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath);
   }
 #endif  // !defined(NDEBUG)
 
   if (!easy_unlock_path.empty()) {
     extensions::ComponentLoader* loader = GetComponentLoader(profile_);
     if (!loader->Exists(extension_misc::kEasyUnlockAppId)) {
       loader->Add(IDR_EASY_UNLOCK_MANIFEST, easy_unlock_path);
-    } else {
-      extensions::ExtensionRegistry* registry =
-          extensions::ExtensionRegistry::Get(profile_);
-
-      // If the app is installed but disabled, then enable it.
-      if (registry->GetExtensionById(extension_misc::kEasyUnlockAppId,
-                                     extensions::ExtensionRegistry::DISABLED)) {
-        ExtensionService* extension_service =
-            extensions::ExtensionSystem::Get(profile_)->extension_service();
-        extension_service->EnableExtension(extension_misc::kEasyUnlockAppId);
-      }
     }
+    ExtensionService* extension_service =
+        extensions::ExtensionSystem::Get(profile_)->extension_service();
+    extension_service->EnableExtension(extension_misc::kEasyUnlockAppId);
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
-void EasyUnlockService::DisableApp() {
+void EasyUnlockService::DisableAppIfLoaded() {
   extensions::ComponentLoader* loader = GetComponentLoader(profile_);
-  extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(profile_);
+  if (!loader->Exists(extension_misc::kEasyUnlockAppId))
+    return;
 
-  if (loader->Exists(extension_misc::kEasyUnlockAppId) &&
-      registry->GetExtensionById(extension_misc::kEasyUnlockAppId,
-                                 extensions::ExtensionRegistry::ENABLED)) {
-    ExtensionService* extension_service =
-        extensions::ExtensionSystem::Get(profile_)->extension_service();
-    extension_service->DisableExtension(extension_misc::kEasyUnlockAppId,
-                                        extensions::Extension::DISABLE_RELOAD);
-  }
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
+  extension_service->DisableExtension(extension_misc::kEasyUnlockAppId,
+                                      extensions::Extension::DISABLE_RELOAD);
 }
 
 void EasyUnlockService::UpdateAppState() {
   if (IsAllowed()) {
     LoadApp();
 
 #if defined(OS_CHROMEOS)
   if (!power_monitor_)
     power_monitor_.reset(new PowerMonitor(this));
 #endif
   } else {
-    DisableApp();
+    DisableAppIfLoaded();
     // Reset the screenlock state handler to make sure Screenlock state set
     // by Easy Unlock app is reset.
     screenlock_state_handler_.reset();
 
 #if defined(OS_CHROMEOS)
     power_monitor_.reset();
 #endif
   }
 }
 
@@ skipping 25 matching lines @@
   // Make sure lock screen state set by the extension gets reset.
   screenlock_state_handler_.reset();
 
   if (GetComponentLoader(profile_)->Exists(extension_misc::kEasyUnlockAppId)) {
     extensions::ExtensionSystem* extension_system =
         extensions::ExtensionSystem::Get(profile_);
     extension_system->extension_service()->ReloadExtension(
         extension_misc::kEasyUnlockAppId);
   }
 }