Revert 207120 "Move histograms and supporting code that don't be..."

The CL appears to break NoSessionRestoreTest.SessionStorage, CookiesClearedOnExit and LocalStorageClearedOnExit browser tests under ASAN.

> Move histograms and supporting code that don't belong in content out.
> 
> R=avi@chromium.org
> 
> Review URL: https://codereview.chromium.org/17151010

TBR=jam@chromium.org

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

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

1 files changed, 18 insertions, 0 deletions

diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 0b6c36a..f18b7c4 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -264,7 +264,13 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE;
   virtual void ResetOverrideEncoding() OVERRIDE;
   virtual RendererPreferences* GetMutableRendererPrefs() OVERRIDE;
+  virtual void SetNewTabStartTime(const base::TimeTicks& time) OVERRIDE;
+  virtual base::TimeTicks GetNewTabStartTime() const OVERRIDE;
   virtual void Close() OVERRIDE;
+  virtual void OnCloseStarted() OVERRIDE;
+  virtual void OnCloseCanceled() OVERRIDE;
+  virtual void OnUnloadStarted() OVERRIDE;
+  virtual void OnUnloadDetachedStarted() OVERRIDE;
   virtual void SystemDragEnded() OVERRIDE;
   virtual void UserGestureDone() OVERRIDE;
   virtual void SetClosedByUserGesture(bool value) OVERRIDE;
@@ -862,6 +868,18 @@ class CONTENT_EXPORT WebContentsImpl
   // Settings that get passed to the renderer process.
   RendererPreferences renderer_preferences_;
 
+  // The time that we started to create the new tab page.
+  base::TimeTicks new_tab_start_time_;
+
+  // The time that we started to close this WebContents.
+  base::TimeTicks close_start_time_;
+
+  // The time when onbeforeunload ended.
+  base::TimeTicks before_unload_end_time_;
+
+  // The time when the tab was removed from view during close.
+  base::TimeTicks unload_detached_start_time_;
+
   // The time that this tab was last selected.
   base::TimeTicks last_selected_time_;