Revert "Add a RWH_TabSwitchPaintDuration histogram."

Causes tab_switching_test to go red.  Reverting this commit
which is part of the investigation.

BUG=4104
TEST=tab_switching_test goes green

Review URL: http://codereview.chromium.org/384049

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

7 files changed, 20 insertions, 64 deletions

diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index b19cb46..b54aba3 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -376,8 +376,6 @@ void RenderWidgetHostViewGtk::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
-  if (tab_switch_paint_time_.is_null())
-    tab_switch_paint_time_ = base::TimeTicks::Now();
   is_hidden_ = false;
   host_->WasRestored();
 }
@@ -597,15 +595,6 @@ void RenderWidgetHostViewGtk::Paint(const gfx::Rect& damage_rect) {
       // time the backing store is NULL...
       whiteout_start_time_ = base::TimeTicks();
     }
-    if (!tab_switch_paint_time_.is_null()) {
-      base::TimeDelta tab_switch_paint_duration = base::TimeTicks::Now() -
-          tab_switch_paint_time_;
-      UMA_HISTOGRAM_TIMES("MPArch.RWH_TabSwitchPaintDuration",
-          tab_switch_paint_duration);
-      // Reset tab_switch_paint_time_ to 0 so future tab selections are
-      // recorded.
-      tab_switch_paint_time_ = base::TimeTicks();
-    }
   } else {
     if (window)
       gdk_window_clear(window);
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index 94f4f1a..c246581 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -120,9 +120,6 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
-  // The time it took after this view was selected for it to be fully painted.
-  base::TimeTicks tab_switch_paint_time_;
-
   // Variables used only for popups --------------------------------------------
   // Our parent widget.
   RenderWidgetHostView* parent_host_view_;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index 67c8abf..9d6ffbb 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -140,9 +140,6 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
-  // The time it took after this view was selected for it to be fully painted.
-  base::TimeTicks tab_switch_paint_time_;
-
   // Variables used by our implementaion of the NSTextInput protocol.
   // An input method of Mac calls the methods of this protocol not only to
   // notify an application of its status, but also to retrieve the status of
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index d043a52..82720be 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -118,8 +118,6 @@ void RenderWidgetHostViewMac::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
-  if (tab_switch_paint_time_.is_null())
-    tab_switch_paint_time_ = base::TimeTicks::Now();
   is_hidden_ = false;
   render_widget_host_->WasRestored();
 }
@@ -825,15 +823,6 @@ void RenderWidgetHostViewMac::SetBackground(const SkBitmap& background) {
       // time the backing store is NULL...
       renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks();
     }
-    if (!renderWidgetHostView_->tab_switch_paint_time_.is_null()) {
-      base::TimeDelta tab_switch_paint_duration = base::TimeTicks::Now() -
-          renderWidgetHostView_->tab_switch_paint_time_;
-      UMA_HISTOGRAM_TIMES("MPArch.RWH_TabSwitchPaintDuration",
-          tab_switch_paint_duration);
-      // Reset tab_switch_paint_time_ to 0 so future tab selections are
-      // recorded.
-      renderWidgetHostView_->tab_switch_paint_time_ = base::TimeTicks();
-    }
   } else {
     [[NSColor whiteColor] set];
     NSRectFill(dirtyRect);
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index d01c410..f97d249 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -255,8 +255,6 @@ void RenderWidgetHostViewWin::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
-  if (tab_switch_paint_time_.is_null())
-    tab_switch_paint_time_ = TimeTicks::Now();
   is_hidden_ = false;
   EnsureTooltip();
   render_widget_host_->WasRestored();
@@ -795,15 +793,6 @@ void RenderWidgetHostViewWin::OnPaint(HDC dc) {
       // time the backing store is NULL...
       whiteout_start_time_ = TimeTicks();
     }
-    if (!tab_switch_paint_time_.is_null()) {
-      TimeDelta tab_switch_paint_duration = TimeTicks::Now() -
-          tab_switch_paint_time_;
-      UMA_HISTOGRAM_TIMES("MPArch.RWH_TabSwitchPaintDuration",
-          tab_switch_paint_duration);
-      // Reset tab_switch_paint_time_ to 0 so future tab selections are
-      // recorded.
-      tab_switch_paint_time_ = TimeTicks();
-    }
   } else {
     DrawBackground(paint_dc.m_ps.rcPaint, &paint_dc);
     if (whiteout_start_time_.is_null())
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 4601ec2..68db850 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -290,9 +290,6 @@ class RenderWidgetHostViewWin :
   // until that bug is fixed.
   bool renderer_accessible_;
 
-  // The time it took after this view was selected for it to be fully painted.
-  base::TimeTicks tab_switch_paint_time_;
-
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };
 
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index 4576fe6..d23bef9 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -25,7 +25,7 @@ namespace {
 // time taken for each switch. It then prints out the times on the console,
 // with the aim that the page cycler parser can interpret these numbers to
 // draw graphs for page cycler Tab Switching Performance.
-// Usage Flags: --enable-logging --dump-histograms-on-exit --log-level=0
+// Usage Flags: -enable-logging -dump-histograms-on-exit -log-level=0
 class TabSwitchingUITest : public UITest {
  public:
   TabSwitchingUITest() {
@@ -61,7 +61,7 @@ class TabSwitchingUITest : public UITest {
     EXPECT_TRUE(CloseBrowser(browser_proxy_.get(), &application_closed));
 
     // Now open the corresponding log file and collect average and std dev from
-    // the histogram stats generated for RenderWidgetHost_TabSwitchPaintDuration
+    // the histogram stats generated for RenderWidgetHostHWND_WhiteoutDuration
     FilePath log_file_name;
     ASSERT_TRUE(PathService::Get(chrome::DIR_LOGS, &log_file_name));
     log_file_name = log_file_name.AppendASCII("chrome_debug.log");
@@ -82,28 +82,26 @@ class TabSwitchingUITest : public UITest {
     const std::string average_str("average = ");
     const std::string std_dev_str("standard deviation = ");
     std::string::size_type pos = contents.find(
-        "Histogram: MPArch.RWH_TabSwitchPaintDuration", 0);
+        "Histogram: MPArch.RWHH_WhiteoutDuration", 0);
     std::string::size_type comma_pos;
     std::string::size_type number_length;
-
-    // Verify we found the TabSwitchPaintDuration histogram.
-    ASSERT_NE(pos, std::string::npos) <<
-        "Histogram: MPArch.RWH_TabSwitchPaintDuration wasn't found\n" <<
-        contents;
-
-    // Get the average.
-    pos = contents.find(average_str, pos);
-    comma_pos = contents.find(",", pos);
-    pos += average_str.length();
-    number_length = comma_pos - pos;
-    average = contents.substr(pos, number_length);
-
-    // Get the std dev.
-    pos = contents.find(std_dev_str, pos);
-    pos += std_dev_str.length();
-    comma_pos = contents.find(" ", pos);
-    number_length = comma_pos - pos;
-    std_dev = contents.substr(pos, number_length);
+    if (pos != std::string::npos) {
+      // Get the average.
+      pos = contents.find(average_str, pos);
+      comma_pos = contents.find(",", pos);
+      pos += average_str.length();
+      number_length = comma_pos - pos;
+      average = contents.substr(pos, number_length);
+
+      // Get the std dev.
+      pos = contents.find(std_dev_str, pos);
+      pos += std_dev_str.length();
+      comma_pos = contents.find(" ", pos);
+      number_length = comma_pos - pos;
+      std_dev = contents.substr(pos, number_length);
+    } else {
+      LOG(WARNING) << "Histogram: MPArch.RWHH_WhiteoutDuration wasn't found";
+    }
 
     // Print the average and standard deviation.
     PrintResultMeanAndError("tab_switch", "", "t",