Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / shell / browser / webkit_test_controller.h

diff --git a/src/content/shell/browser/webkit_test_controller.h b/src/content/shell/browser/webkit_test_controller.h
index dfae5bd..925a208 100644 (file)
--- a/src/content/shell/browser/webkit_test_controller.h
+++ b/src/content/shell/browser/webkit_test_controller.h
@@ -16,9 +16,9 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/web_preferences.h"
 #include "content/shell/common/leak_detection_result.h"
 #include "ui/gfx/size.h"
-#include "webkit/common/webpreferences.h"
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
@@ -106,7 +106,7 @@ class WebKitTestController : public base::NonThreadSafe,
   static WebKitTestController* Get();
 
   WebKitTestController();
-  virtual ~WebKitTestController();
+  ~WebKitTestController() override;
 
   // True if the controller is ready for testing.
   bool PrepareForLayoutTest(const GURL& test_url,
@@ -132,20 +132,20 @@ class WebKitTestController : public base::NonThreadSafe,
   void DevToolsProcessCrashed();
 
   // WebContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void PluginCrashed(const base::FilePath& plugin_path,
-                             base::ProcessId plugin_pid) OVERRIDE;
-  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid) override;
+  void RenderViewCreated(RenderViewHost* render_view_host) override;
+  void RenderProcessGone(base::TerminationStatus status) override;
+  void WebContentsDestroyed() override;
 
   // NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const NotificationSource& source,
+               const NotificationDetails& details) override;
 
   // GpuDataManagerObserver implementation.
-  virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE;
+  void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
 
  private:
   enum TestPhase {
@@ -212,6 +212,7 @@ class WebKitTestController : public base::NonThreadSafe,
   NotificationRegistrar registrar_;
 
   const bool is_leak_detection_enabled_;
+  bool crash_when_leak_found_;
 
 #if defined(OS_ANDROID)
   // Because of the nested message pump implementation, Android needs to allow