Clean up a few TODO items.

content/test/test_renderer_host.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_TEST_TEST_RENDERER_HOST_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 39 matching lines @@
   static RenderViewHost* GetPendingForController(
       NavigationController* controller);
 
   // This removes the need to expose
   // RenderViewHostImpl::is_swapped_out() outside of content.
   //
   // This is safe to call on any RenderViewHost, not just ones
   // constructed while a RenderViewHostTestEnabler is in play.
   static bool IsRenderViewHostSwappedOut(RenderViewHost* rvh);
 
+  // Calls the RenderViewHosts' private OnMessageReceived function with the
+  // given message.
+  static bool TestOnMessageReceived(RenderViewHost* rvh,
+                                    const IPC::Message& msg);
+
   virtual ~RenderViewHostTester() {}
 
   // Gives tests access to RenderViewHostImpl::CreateRenderView.
   virtual bool CreateRenderView(const string16& frame_name,
                                 int32 max_page_id) = 0;
 
   // Calls OnMsgNavigate on the RenderViewHost with the given information,
   // setting the rest of the parameters in the message to the "typical" values.
   // This is a helper function for simulating the most common types of loads.
   virtual void SendNavigate(int page_id, const GURL& url) = 0;
@@ skipping 13 matching lines @@
   virtual void SetContentsMimeType(const std::string& mime_type) = 0;
 
   // Simulates the SwapOut_ACK that fires if you commit a cross-site
   // navigation without making any network requests.
   virtual void SimulateSwapOutACK() = 0;
 
   // Makes the WasHidden/WasRestored calls to the RenderWidget that
   // tell it it has been hidden or restored from having been hidden.
   virtual void SimulateWasHidden() = 0;
   virtual void SimulateWasRestored() = 0;
-
-  // Calls the RenderViewHosts' private OnMessageReceived function with the
-  // given message.
-  virtual bool TestOnMessageReceived(const IPC::Message& msg) = 0;
 };
 
 // You can instantiate only one class like this at a time.  During its
 // lifetime, RenderViewHost objects created may be used via
 // RenderViewHostTester.
 class RenderViewHostTestEnabler {
  public:
   RenderViewHostTestEnabler();
   ~RenderViewHostTestEnabler();
 
@@ skipping 66 matching lines @@
   scoped_ptr<aura::RootWindow> root_window_;
   scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
-// TODO(joi): Remove this after converting all clients.
-using content::RenderViewHostTestHarness;
-
 #endif  // CONTENT_TEST_TEST_RENDERER_HOST_H_