Configure termination-on-heap-corruption using a delegate method rather than a parameter, in order to defer calculating the value until after the AtExitManager is initialized.

BUG=398747

Review URL: https://codereview.chromium.org/434533005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287069 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 3 deletions

diff --git a/content/public/app/content_main.h b/content/public/app/content_main.h
index f3ead71..201fca7 100644
--- a/content/public/app/content_main.h
+++ b/content/public/app/content_main.h
@@ -25,7 +25,6 @@ class ContentMainDelegate;
 struct ContentMainParams {
   explicit ContentMainParams(ContentMainDelegate* delegate)
       : delegate(delegate),
-        enable_termination_on_heap_corruption(true),
 #if defined(OS_WIN)
         instance(NULL),
         sandbox_info(NULL),
@@ -38,8 +37,6 @@ struct ContentMainParams {
 
   ContentMainDelegate* delegate;
 
-  bool enable_termination_on_heap_corruption;
-
 #if defined(OS_WIN)
   HINSTANCE instance;
 
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index 433300c..498bc86 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -48,6 +48,10 @@ void ContentMainDelegate::ZygoteStarting(
 
 #endif
 
+bool ContentMainDelegate::ShouldEnableTerminationOnHeapCorruption() {
+  return true;
+}
+
 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
 #if defined(CHROME_MULTIPLE_DLL_CHILD)
   return NULL;
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
index 6191d78..6273950 100644
--- a/content/public/app/content_main_delegate.h
+++ b/content/public/app/content_main_delegate.h
@@ -76,6 +76,13 @@ class CONTENT_EXPORT ContentMainDelegate {
   virtual void ZygoteForked() {}
 #endif  // OS_MACOSX
 
+  // Allows the embedder to disable termination on heap corruption.
+  // This is being used to measure the impact of this feature on crash reports.
+  // Termination on heap corruption is enabled by default.
+  // TODO(erikwright): Remove this by September 2014 when experimentation is
+  // complete.
+  virtual bool ShouldEnableTerminationOnHeapCorruption();
+
  protected:
   friend class ContentClientInitializer;