Remove hacks added to workaround a system salt issue for M31

chrome/browser/chromeos/app_mode/startup_app_launcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 60 matching lines @@
     std::string refresh_token;
     std::string client_id;
     std::string client_secret;
   };
 
   void OnLaunchSuccess();
   void OnLaunchFailure(KioskAppLaunchError::Error error);
 
   void BeginInstall();
   void InstallCallback(bool success, const std::string& error);
-  void EnsureSystemSaltIsLoaded();
-  void OnReadyToLaunch(const std::string& system_salt);
+  void OnReadyToLaunch();
 
   void InitializeTokenService();
   void InitializeNetwork();
 
   void StartLoadingOAuthFile();
   static void LoadOAuthFileOnBlockingPool(KioskOAuthParams* auth_params);
   void OnOAuthFileLoaded(KioskOAuthParams* auth_params);
 
   // OAuth2TokenService::Observer overrides.
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
@@ skipping 10 matching lines @@
 
   scoped_refptr<extensions::WebstoreStandaloneInstaller> installer_;
   KioskOAuthParams auth_params_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupAppLauncher);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_