2 files changed, 7 insertions, 16 deletions
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index f920a2f..001e7b1 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,7 +13,6 @@
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
-#include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
@@ -35,12 +34,6 @@ const int32 kRouteId = 5;
 const int32 kOpenerId = 7;
 }  // namespace
 
-RenderViewTest::RenderViewTest() {
-}
-
-RenderViewTest::~RenderViewTest() {
-}
-
 void RenderViewTest::ProcessPendingMessages() {
   msg_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask());
   msg_loop_.Run();
@@ -96,7 +89,7 @@ void RenderViewTest::SetUp() {
       Extension::kPermissionNames + Extension::kNumPermissions);
   ExtensionProcessBindings::SetAPIPermissions("", permissions);
 
-  mock_process_.reset(new MockRenderProcess);
+  mock_process_.reset(new MockProcess());
 
   render_thread_.set_routing_id(kRouteId);
 
@@ -109,7 +102,6 @@ void RenderViewTest::SetUp() {
   // Attach a pseudo keyboard device to this object.
   mock_keyboard_.reset(new MockKeyboard());
 }
-
 void RenderViewTest::TearDown() {
   // Try very hard to collect garbage before shutting down.
   GetMainFrame()->collectGarbage();
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index 6a36097..add9d55 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,6 +13,7 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/sandbox_init_wrapper.h"
 #include "chrome/renderer/mock_keyboard.h"
+#include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/mock_render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
@@ -20,12 +21,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 
-class MockRenderProcess;
-
 class RenderViewTest : public testing::Test {
  public:
-  RenderViewTest();
-  ~RenderViewTest();
+  RenderViewTest() {}
+  ~RenderViewTest() {}
 
  protected:
   // Spins the message loop to process all messages that are currently pending.
@@ -57,7 +56,7 @@ class RenderViewTest : public testing::Test {
 
   MessageLoop msg_loop_;
   MockRenderThread render_thread_;
-  scoped_ptr<MockRenderProcess> mock_process_;
+  scoped_ptr<MockProcess> mock_process_;
   scoped_refptr<RenderView> view_;
   RendererWebKitClientImpl webkitclient_;
   scoped_ptr<MockKeyboard> mock_keyboard_;