TabFirstRenderWatcher -> TabRenderWatcher.

chrome/browser/tab_render_watcher_browsertest.cc

Index: chrome/browser/tab_render_watcher_browsertest.cc
diff --git a/chrome/browser/tab_first_render_watcher_browsertest.cc b/chrome/browser/tab_render_watcher_browsertest.cc
similarity index 73%
rename from chrome/browser/tab_first_render_watcher_browsertest.cc
rename to chrome/browser/tab_render_watcher_browsertest.cc
index 9172500e9628dc2b27688666dc2492c600455a5d..b16c7b4d889ffce73d1fd3e293d4c6ce4925c459 100644
--- a/chrome/browser/tab_first_render_watcher_browsertest.cc
+++ b/chrome/browser/tab_render_watcher_browsertest.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #include "base/message_loop.h"
-#include "chrome/browser/tab_first_render_watcher.h"
+#include "chrome/browser/tab_render_watcher.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/common/url_constants.h"
@@ -26,16 +26,16 @@ views::Widget* CreateWindowForContents(views::View* contents) {
 
 }  // namespace
 
-class TabFirstRenderWatcherTest : public InProcessBrowserTest,
-                                  public TabFirstRenderWatcher::Delegate {
+class TabRenderWatcherTest : public InProcessBrowserTest,
+                             public TabRenderWatcher::Delegate {
  public:
-  TabFirstRenderWatcherTest()
+  TabRenderWatcherTest()
       : host_created_(false),
         main_frame_loaded_(false),
         main_frame_rendered_(false) {
   }
 
-  // TabFirstRenderWatcher::Delegate implementation.
+  // TabRenderWatcher::Delegate implementation.
   virtual void OnRenderHostCreated(RenderViewHost* host) OVERRIDE {
     host_created_ = true;
   }
@@ -45,7 +45,7 @@ class TabFirstRenderWatcherTest : public InProcessBrowserTest,
     MessageLoop::current()->Quit();
   }
 
-  virtual void OnTabMainFrameFirstRender() OVERRIDE {
+  virtual void OnTabMainFrameRender() OVERRIDE {
     main_frame_rendered_ = true;
     MessageLoop::current()->Quit();
   }
@@ -58,16 +58,14 @@ class TabFirstRenderWatcherTest : public InProcessBrowserTest,
 
 // Migrated from HtmlDialogBrowserTest.TestStateTransition, which times out
 // about 5~10% of runs. See crbug.com/86059.
-IN_PROC_BROWSER_TEST_F(TabFirstRenderWatcherTest,
-                       DISABLED_TestStateTransition) {
+IN_PROC_BROWSER_TEST_F(TabRenderWatcherTest, DISABLED_TestStateTransition) {
   DOMView* dom_view = new DOMView;
   dom_view->Init(browser()->profile(), NULL);
   CreateWindowForContents(dom_view);
   dom_view->GetWidget()->Show();
 
-  scoped_ptr<TabFirstRenderWatcher> watcher(
-      new TabFirstRenderWatcher(dom_view->dom_contents()->web_contents(),
-                                this));
+  scoped_ptr<TabRenderWatcher> watcher(
+      new TabRenderWatcher(dom_view->dom_contents()->web_contents(), this));
 
   EXPECT_FALSE(host_created_);
   EXPECT_FALSE(main_frame_loaded_);
@@ -80,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(TabFirstRenderWatcherTest,
   MessageLoopForUI::current()->Run();
   EXPECT_TRUE(main_frame_loaded_);
 
-  // OnTabMainFrameFirstRender() will Quit().
+  // OnTabMainFrameRender() will Quit().
   MessageLoopForUI::current()->Run();
   EXPECT_TRUE(main_frame_rendered_);