Make the kiosk code not depend on Ash in Athena

chrome/browser/chromeos/app_mode/kiosk_app_manager.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_KIOSK_APP_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 namespace extensions {
 class Extension;
 class ExternalLoader;
 }
 
 namespace chromeos {
 
 class KioskAppData;
 class KioskAppExternalLoader;
 class KioskAppManagerObserver;
+
+#if !defined(USE_ATHENA)
 class KioskExternalUpdater;
+#endif
 
 // KioskAppManager manages cached app data.
 class KioskAppManager : public KioskAppDataDelegate,
                         public ExternalCache::Delegate {
  public:
   enum ConsumerKioskAutoLaunchStatus {
     // Consumer kiosk mode auto-launch feature can be enabled on this machine.
     CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
     // Consumer kiosk auto-launch feature is enabled on this machine.
     CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED,
@@ skipping 216 matching lines @@
   ScopedVector<KioskAppData> apps_;
   std::string auto_launch_app_id_;
   ObserverList<KioskAppManagerObserver, true> observers_;
 
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_accounts_subscription_;
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_account_auto_login_id_subscription_;
 
   scoped_ptr<ExternalCache> external_cache_;
+
+#if !defined(USE_ATHENA)
   scoped_ptr<KioskExternalUpdater> usb_stick_updater_;
+#endif
 
   // The extension external loader for installing kiosk app.
   bool external_loader_created_;
   base::WeakPtr<KioskAppExternalLoader> external_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_