Add histogram for how tab closing time. Did some cleanup along the way.

chrome/browser/tab_contents/tab_contents.h

 // Copyright (c) 2009 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_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 605 matching lines @@
   // We want to time how long it takes to create a new tab page.  This method
   // gets called as parts of the new tab page have loaded.
   void LogNewTabTime(const std::string& event_name);
 
   // Set the time when we started to create the new tab page.  This time is
   // from before we created this TabContents.
   void set_new_tab_start_time(const base::TimeTicks& time) {
     new_tab_start_time_ = time;
   }
 
+  // Notification that tab closing has started.  This can be called multiple
+  // times, subsequent calls are ignored.
+  void OnCloseStarted();
+
  private:
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
   // automation purposes.
   friend class AutomationProvider;
   friend class BlockedPopupContainerTest;
   friend class BlockedPopupContainerControllerTest;
 
   FRIEND_TEST(BlockedPopupContainerTest, TestReposition);
   FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials);
@@ skipping 223 matching lines @@
                            const std::wstring& title);
   virtual void UpdateEncoding(RenderViewHost* render_view_host,
                               const std::string& encoding);
   virtual void UpdateTargetURL(int32 page_id, const GURL& url);
   virtual void UpdateThumbnail(const GURL& url,
                                const SkBitmap& bitmap,
                                const ThumbnailScore& score);
   virtual void UpdateInspectorSettings(const std::string& raw_settings);
   virtual void Close(RenderViewHost* render_view_host);
   virtual void RequestMove(const gfx::Rect& new_bounds);
-  virtual void DidStartLoading(RenderViewHost* render_view_host);
-  virtual void DidStopLoading(RenderViewHost* render_view_host);
+  virtual void DidStartLoading();
+  virtual void DidStopLoading();
   virtual void RequestOpenURL(const GURL& url, const GURL& referrer,
                               WindowOpenDisposition disposition);
   virtual void DomOperationResponse(const std::string& json_string,
                                     int automation_id);
   virtual void ProcessDOMUIMessage(const std::string& message,
                                    const Value* content,
                                    int request_id,
                                    bool has_callback);
   virtual void ProcessExternalHostMessage(const std::string& message,
                                           const std::string& origin,
@@ skipping 40 matching lines @@
                                   void* params);
   virtual void FileSelectionCanceled(void* params);
 
   // RenderViewHostManager::Delegate -------------------------------------------
 
   virtual void BeforeUnloadFiredFromRenderManager(
       bool proceed,
       bool* proceed_to_fire_unload);
   virtual void DidStartLoadingFromRenderManager(
       RenderViewHost* render_view_host) {
-    DidStartLoading(render_view_host);
+    DidStartLoading();
   }
   virtual void RenderViewGoneFromRenderManager(
       RenderViewHost* render_view_host) {
     RenderViewGone(render_view_host);
   }
   virtual void UpdateRenderViewSizeForRenderManager();
   virtual void NotifySwappedFromRenderManager() {
     NotifySwapped();
   }
   virtual NavigationController& GetControllerForRenderManager() {
@@ skipping 197 matching lines @@
   ScopedHandle message_box_active_;
 #endif
 
   // The time that the last javascript message was dismissed.
   base::TimeTicks last_javascript_message_dismissal_;
 
   // True if the user has decided to block future javascript messages. This is
   // reset on navigations to false on navigations.
   bool suppress_javascript_messages_;
 
+  // Set to true when there is an active "before unload" dialog.  When true,
+  // we've forced the throbber to start in Navigate, and we need to remember to
+  // turn it off in OnJavaScriptMessageBoxClosed if the navigation is canceled.
+  bool is_showing_before_unload_dialog_;
+
   // Shows an info-bar to users when they search from a known search engine and
   // have never used the monibox for search before.
   scoped_ptr<OmniboxSearchHint> omnibox_search_hint_;
 
   // Settings that get passed to the renderer process.
   RendererPreferences renderer_preferences_;
 
   // If this tab was created from a renderer using window.open, this will be
   // non-NULL and represent the DOMUI of the opening renderer.
   DOMUITypeID opener_dom_ui_type_;
 
   // The time that we started to create the new tab page.
   base::TimeTicks new_tab_start_time_;
 
+  // The time that we started to close the tab.
+  base::TimeTicks tab_close_start_time_;
+
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_