Add a new app API to enable watchdog behavior restarts in kiosk apps

extensions/browser/api/runtime/runtime_api.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_API_RUNTIME_RUNTIME_API_H_
 #define EXTENSIONS_BROWSER_API_RUNTIME_RUNTIME_API_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 47 matching lines @@
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   void ReloadExtension(const std::string& extension_id);
   bool CheckForUpdates(const std::string& extension_id,
                        const RuntimeAPIDelegate::UpdateCheckCallback& callback);
   void OpenURL(const GURL& uninstall_url);
   bool GetPlatformInfo(api::runtime::PlatformInfo* info);
   bool RestartDevice(std::string* error_message);
+
+  using OnWatchdogTimeoutCallback =
+      base::Callback<void(bool success, const std::string& message)>;
+  void RestartDeviceOnWatchdogTimeout(
+      const Extension* extension,
+      int seconds,
+      const OnWatchdogTimeoutCallback& callback);
+
   bool OpenOptionsPage(const Extension* extension);
 
  private:
   friend class BrowserContextKeyedAPIFactory<RuntimeAPI>;
+  friend class RestartOnWatchdogApiTest;
 
   // ExtensionRegistryObserver implementation.
   void OnExtensionLoaded(content::BrowserContext* browser_context,
                          const Extension* extension) override;
   void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
                                   const Extension* extension,
                                   bool is_update,
                                   const std::string& old_name) override;
   void OnExtensionUninstalled(content::BrowserContext* browser_context,
                               const Extension* extension,
                               UninstallReason reason) override;
 
+  void OnRestartWatchdogTimeout(const Extension* extension,
+                                const OnWatchdogTimeoutCallback& callback);
+
   // BrowserContextKeyedAPI implementation:
   static const char* service_name() { return "RuntimeAPI"; }
   static const bool kServiceRedirectedInIncognito = true;
   static const bool kServiceIsNULLWhileTesting = true;
   void Shutdown() override;
 
   // extensions::UpdateObserver overrides:
   void OnAppUpdateAvailable(const Extension* extension) override;
   void OnChromeUpdateAvailable() override;
 
   // ProcessManagerObserver implementation:
   void OnBackgroundHostStartup(const Extension* extension) override;
 
   // Pref related functions that deals with info about installed extensions that
   // has not been loaded yet.
   // Used to send chrome.runtime.onInstalled event upon loading the extensions.
   bool ReadPendingOnInstallInfoFromPref(const ExtensionId& extension_id,
                                         base::Version* previous_version);
   void RemovePendingOnInstallInfoFromPref(const ExtensionId& extension_id);
   void StorePendingOnInstallInfoToPref(const Extension* extension);
 
+  void SetMinDurationBetweenRestartsForTesting(base::TimeDelta delta) {
+    minimum_duration_between_restarts_ = delta;
+  }
+
   std::unique_ptr<RuntimeAPIDelegate> delegate_;
 
   content::BrowserContext* browser_context_;
 
   // True if we should dispatch the chrome.runtime.onInstalled event with
   // reason "chrome_update" upon loading each extension.
   bool dispatch_chrome_updated_event_;
 
   content::NotificationRegistrar registrar_;
 
   // Listen to extension notifications.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
   ScopedObserver<ProcessManager, ProcessManagerObserver>
       process_manager_observer_;
 
+  // The timer that will trigger a device restart when it times out.
+  base::OneShotTimer watchdog_timer_;

[xiyuan, 2016/05/13 17:56:15]

nit: #include "base/timer/timer.h"

[afakhry, 2016/05/14 01:27:35]

Done.

+
+  // The minimum allowed duration between two successive restarts on watchdog
+  // timer.
+  base::TimeDelta minimum_duration_between_restarts_;

[xiyuan, 2016/05/13 17:56:15]

nit: #include "base/time/time.h"

[afakhry, 2016/05/14 01:27:35]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(RuntimeAPI);
 };
 
 template <>
 void BrowserContextKeyedAPIFactory<RuntimeAPI>::DeclareFactoryDependencies();
 
 class RuntimeEventRouter {
  public:
   // Dispatches the onStartup event to all currently-loaded extensions.
   static void DispatchOnStartupEvent(content::BrowserContext* context,
@@ skipping 82 matching lines @@
 
 class RuntimeRestartFunction : public UIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("runtime.restart", RUNTIME_RESTART)
 
  protected:
   ~RuntimeRestartFunction() override {}
   ResponseAction Run() override;
 };
 
+class RuntimeRestartOnWatchdogFunction : public UIThreadExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("runtime.restartOnWatchdog",
+                             RUNTIME_RESTARTONWATCHDOG)
+
+ protected:
+  ~RuntimeRestartOnWatchdogFunction() override {}
+  ResponseAction Run() override;
+
+ private:
+  void OnWatchdogTimeout(bool success, const std::string& message);
+};
+
 class RuntimeGetPlatformInfoFunction : public UIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("runtime.getPlatformInfo",
                              RUNTIME_GETPLATFORMINFO);
 
  protected:
   ~RuntimeGetPlatformInfoFunction() override {}
   ResponseAction Run() override;
 };
 
 class RuntimeGetPackageDirectoryEntryFunction
     : public UIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("runtime.getPackageDirectoryEntry",
                              RUNTIME_GETPACKAGEDIRECTORYENTRY)
 
  protected:
   ~RuntimeGetPackageDirectoryEntryFunction() override {}
   ResponseAction Run() override;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_RUNTIME_RUNTIME_API_H_