Remove hacks added to workaround a system salt issue for M31

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

 // Copyright 2013 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/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/webstore_startup_installer.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h"
-#include "chromeos/cryptohome/system_salt_getter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::WebstoreStartupInstaller;
 
 namespace chromeos {
@@ skipping 202 matching lines @@
   OnLaunchSuccess();
 }
 
 void StartupAppLauncher::BeginInstall() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInstallingApp());
 
   DVLOG(1) << "BeginInstall... connection = "
            <<  net::NetworkChangeNotifier::GetConnectionType();
 
   if (IsAppInstalled(profile_, app_id_)) {
-    EnsureSystemSaltIsLoaded();
+    OnReadyToLaunch();
     return;
   }
 
   installer_ = new WebstoreStartupInstaller(
       app_id_,
       profile_,
       false,
       base::Bind(&StartupAppLauncher::InstallCallback, AsWeakPtr()));
   installer_->BeginInstall();
 }
 
 void StartupAppLauncher::InstallCallback(bool success,
                                          const std::string& error) {
   installer_ = NULL;
   if (success) {
     // Finish initialization after the callback returns.
     // So that the app finishes its installation.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
-        base::Bind(&StartupAppLauncher::EnsureSystemSaltIsLoaded,
+        base::Bind(&StartupAppLauncher::OnReadyToLaunch,
                    AsWeakPtr()));
     return;
   }
 
   LOG(ERROR) << "App install failed: " << error;
   OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_INSTALL);
 }
 
-void StartupAppLauncher::EnsureSystemSaltIsLoaded() {
-  // Defer app launch until system salt is loaded to make sure that identity
-  // api works with the enterprise kiosk app.
-  SystemSaltGetter::Get()->GetSystemSalt(
-      base::Bind(&StartupAppLauncher::OnReadyToLaunch, AsWeakPtr()));
-}
-
-void StartupAppLauncher::OnReadyToLaunch(const std::string& system_salt) {
-  if (system_salt.empty()) {
-    LOG(ERROR) << "Could not load system salt.";
-    OnLaunchFailure(KioskAppLaunchError::CRYPTOHOMED_NOT_RUNNING);
-    return;
-  }
-
+void StartupAppLauncher::OnReadyToLaunch() {
   ready_to_launch_ = true;
   FOR_EACH_OBSERVER(Observer, observer_list_, OnReadyToLaunch());
 }
 
 void StartupAppLauncher::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DVLOG(1) << "OnNetworkChanged... connection = "
            <<  net::NetworkChangeNotifier::GetConnectionType();
   if (!net::NetworkChangeNotifier::IsOffline()) {
     DVLOG(1) << "Network up and running!";
     net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 
     BeginInstall();
   } else {
     DVLOG(1) << "Network not running yet!";
   }
 }
 
 }   // namespace chromeos