Smart Lock: Remove unused methods from EasyUnlockAppManager.

R=hansberry@chromium.org

Bug: 899324
Test: none
Change-Id: I2c85ce8fcd794998583c7b5bb63a51b3e90ce450
Reviewed-on: https://chromium-review.googlesource.com/c/1312295Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604488}

chrome/browser/chromeos/login/easy_unlock/easy_unlock_app_manager.cc

@@ -37,10 +37,8 @@ class EasyUnlockAppManagerImpl : public EasyUnlockAppManager {
 
   // EasyUnlockAppManager overrides.
   void EnsureReady(const base::Closure& ready_callback) override;
-  void LaunchSetup() override;
   void LoadApp() override;
   void DisableAppIfLoaded() override;
-  void ReloadApp() override;
   bool SendAuthAttemptEvent() override;
 
  private:
@@ -72,25 +70,6 @@ void EasyUnlockAppManagerImpl::EnsureReady(
   extension_system_->ready().Post(FROM_HERE, ready_callback);
 }
 
-void EasyUnlockAppManagerImpl::LaunchSetup() {
-  extensions::ExtensionService* extension_service =
-      extension_system_->extension_service();
-  if (!extension_service)
-    return;
-
-  const extensions::Extension* extension =
-      extension_service->GetExtensionById(app_id_, false);
-  if (!extension) {
-    PA_LOG(WARNING) << "No extension";
-    return;
-  }
-
-  OpenApplication(AppLaunchParams(extension_service->profile(), extension,
-                                  extensions::LAUNCH_CONTAINER_WINDOW,
-                                  WindowOpenDisposition::NEW_WINDOW,
-                                  extensions::SOURCE_CHROME_INTERNAL));
-}
-
 void EasyUnlockAppManagerImpl::LoadApp() {
   extensions::ExtensionService* extension_service =
       extension_system_->extension_service();
@@ -127,18 +106,6 @@ void EasyUnlockAppManagerImpl::DisableAppIfLoaded() {
       app_id_, extensions::disable_reason::DISABLE_RELOAD);
 }
 
-void EasyUnlockAppManagerImpl::ReloadApp() {
-  extensions::ExtensionService* extension_service =
-      extension_system_->extension_service();
-  if (!extension_service)
-    return;
-
-  if (!extension_service->component_loader()->Exists(app_id_))
-    return;
-
-  extension_service->ReloadExtension(app_id_);
-}
-
 bool EasyUnlockAppManagerImpl::SendAuthAttemptEvent() {
   extensions::ExtensionService* extension_service =
       extension_system_->extension_service();

chrome/browser/chromeos/login/easy_unlock/easy_unlock_app_manager.h

@@ -36,18 +36,12 @@ class EasyUnlockAppManager {
   // Note that the callback may be triggered after |this| is deleted.
   virtual void EnsureReady(const base::Closure& ready_callback) = 0;
 
-  // Launches Easy Unlock setup app, if the setup app is loaded.
-  virtual void LaunchSetup() = 0;
-
   // Loads Easy Unlock app.
   virtual void LoadApp() = 0;
 
   // Disables Easy Unlock app.
   virtual void DisableAppIfLoaded() = 0;
 
-  // Reloads Easy Unlock app.
-  virtual void ReloadApp() = 0;
-
   // Sends screenlockPrivate.onAuthAttempted event to Easy Unlock app.
   virtual bool SendAuthAttemptEvent() = 0;
 };

chrome/browser/chromeos/login/easy_unlock/easy_unlock_app_manager_unittest.cc

@@ -338,44 +338,6 @@ TEST_F(EasyUnlockAppManagerTest, LoadAppPreviouslyDisabled) {
       extension_misc::kEasyUnlockAppId, false));
 }
 
-TEST_F(EasyUnlockAppManagerTest, ReloadApp) {
-  SetExtensionSystemReady();
-
-  extension_service_->component_loader()->Add(IDR_EASY_UNLOCK_MANIFEST,
-                                              GetAppPath());
-
-  ExtensionReloadTracker reload_tracker(&profile_,
-                                        extension_misc::kEasyUnlockAppId);
-  ASSERT_FALSE(reload_tracker.HasReloaded());
-
-  app_manager_->ReloadApp();
-
-  EXPECT_TRUE(reload_tracker.HasReloaded());
-  EXPECT_TRUE(extension_service_->GetExtensionById(
-      extension_misc::kEasyUnlockAppId, false));
-}
-
-TEST_F(EasyUnlockAppManagerTest, ReloadAppDisabled) {
-  SetExtensionSystemReady();
-
-  extension_service_->component_loader()->Add(IDR_EASY_UNLOCK_MANIFEST,
-                                              GetAppPath());
-  extension_service_->DisableExtension(
-      extension_misc::kEasyUnlockAppId,
-      extensions::disable_reason::DISABLE_RELOAD);
-  ExtensionReloadTracker reload_tracker(&profile_,
-                                        extension_misc::kEasyUnlockAppId);
-  ASSERT_FALSE(reload_tracker.HasReloaded());
-
-  app_manager_->ReloadApp();
-
-  EXPECT_FALSE(reload_tracker.HasReloaded());
-  EXPECT_TRUE(extension_service_->GetExtensionById(
-      extension_misc::kEasyUnlockAppId, true));
-  EXPECT_FALSE(
-      extension_service_->IsExtensionEnabled(extension_misc::kEasyUnlockAppId));
-}
-
 TEST_F(EasyUnlockAppManagerTest, DisableApp) {
   SetExtensionSystemReady();
 
@@ -430,40 +392,6 @@ TEST_F(EasyUnlockAppManagerTest, EnsureReadyAfterExtesionSystemReady) {
   ASSERT_TRUE(ready);
 }
 
-TEST_F(EasyUnlockAppManagerTest, LaunchSetup) {
-  SetExtensionSystemReady();
-
-  ASSERT_EQ(0, AppLaunchedCount());
-
-  app_manager_->LoadApp();
-  app_manager_->LaunchSetup();
-
-  EXPECT_EQ(1, AppLaunchedCount());
-}
-
-TEST_F(EasyUnlockAppManagerTest, LaunchSetupWhenDisabled) {
-  SetExtensionSystemReady();
-
-  ASSERT_EQ(0, AppLaunchedCount());
-
-  app_manager_->LoadApp();
-  app_manager_->DisableAppIfLoaded();
-
-  app_manager_->LaunchSetup();
-
-  EXPECT_EQ(0, AppLaunchedCount());
-}
-
-TEST_F(EasyUnlockAppManagerTest, LaunchSetupWhenNotLoaded) {
-  SetExtensionSystemReady();
-
-  ASSERT_EQ(0, AppLaunchedCount());
-
-  app_manager_->LaunchSetup();
-
-  EXPECT_EQ(0, AppLaunchedCount());
-}
-
 TEST_F(EasyUnlockAppManagerTest, SendAuthAttempted) {
   SetExtensionSystemReady();
 

chrome/browser/chromeos/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc

@@ -62,14 +62,10 @@ class FakeAppManager : public EasyUnlockAppManager {
     ADD_FAILURE() << "Not reached";
   }
 
-  void LaunchSetup() override { ADD_FAILURE() << "Not reached"; }
-
   void LoadApp() override { ADD_FAILURE() << "Not reached"; }
 
   void DisableAppIfLoaded() override { ADD_FAILURE() << "Not reached"; }
 
-  void ReloadApp() override { ADD_FAILURE() << "Not reached"; }
-
   bool SendAuthAttemptEvent() override {
     ++auth_attempt_count_;
     return !auth_attempt_should_fail_;

chrome/browser/chromeos/login/easy_unlock/easy_unlock_service_unittest_chromeos.cc

@@ -77,8 +77,6 @@ class TestAppManager : public EasyUnlockAppManager {
  public:
   TestAppManager()
       : state_(STATE_NOT_LOADED),
-        app_launch_count_(0u),
-        reload_count_(0u),
         ready_(false) {}
   ~TestAppManager() override {}
 
@@ -86,8 +84,6 @@ class TestAppManager : public EasyUnlockAppManager {
   enum State { STATE_NOT_LOADED, STATE_LOADED, STATE_DISABLED };
 
   State state() const { return state_; }
-  size_t app_launch_count() const { return app_launch_count_; }
-  size_t reload_count() const { return reload_count_; }
 
   // Marks the manager as ready and runs |ready_callback_| if there is one set.
   void SetReady() {
@@ -107,11 +103,6 @@ class TestAppManager : public EasyUnlockAppManager {
     ready_callback_ = ready_callback;
   }
 
-  void LaunchSetup() override {
-    ASSERT_EQ(STATE_LOADED, state_);
-    ++app_launch_count_;
-  }
-
   void LoadApp() override { state_ = STATE_LOADED; }
 
   void DisableAppIfLoaded() override {
@@ -119,11 +110,6 @@ class TestAppManager : public EasyUnlockAppManager {
       state_ = STATE_DISABLED;
   }
 
-  void ReloadApp() override {
-    if (state_ == STATE_LOADED)
-      ++reload_count_;
-  }
-
   bool SendAuthAttemptEvent() override {
     ADD_FAILURE() << "Not reached.";
     return false;
@@ -133,12 +119,6 @@ class TestAppManager : public EasyUnlockAppManager {
   // The current app state.
   State state_;
 
-  // Number of times LaunchSetup was called.
-  size_t app_launch_count_;
-
-  // Number of times ReloadApp was called.
-  size_t reload_count_;
-
   // Whether the manager is ready. Set using |SetReady|.
   bool ready_;
   // If |EnsureReady| was called before |SetReady|, cached callback that will be