Removed static factories for data, ftp, file, and about jobs.

content/browser/renderer_host/render_view_host_unittest.cc

 // 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/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
+#include "content/test/test_content_browser_client.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
 #include "webkit/glue/webdropdata.h"
 
 namespace content {
 
+class RenderViewHostTestBrowserClient : public TestContentBrowserClient {
+ public:
+  RenderViewHostTestBrowserClient() {}
+  virtual ~RenderViewHostTestBrowserClient() {}
+
+  virtual bool IsHandledURL(const GURL& url) OVERRIDE {
+    return url.scheme() == chrome::kFileScheme;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestBrowserClient);
+};
+
 class RenderViewHostTest : public RenderViewHostImplTestHarness {
+ public:
+  RenderViewHostTest() : old_browser_client_(NULL) {}
+  virtual ~RenderViewHostTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    RenderViewHostImplTestHarness::SetUp();
+    old_browser_client_ = GetContentClient()->browser();
+    GetContentClient()->set_browser_for_testing(&test_browser_client_);
+  }
+
+  virtual void TearDown() OVERRIDE {
+    RenderViewHostImplTestHarness::TearDown();
+    GetContentClient()->set_browser_for_testing(old_browser_client_);

[mmenke, 2013/02/19 17:26:15]

This should be first, so cleanup order is the reverse of setup order.

[pauljensen, 2013/02/20 15:13:27]

Done.

+  }
+
+ private:
+  RenderViewHostTestBrowserClient test_browser_client_;
+  ContentBrowserClient* old_browser_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderViewHostTest);
 };
 
 // All about URLs reported by the renderer should get rewritten to about:blank.
 // See RenderViewHost::OnNavigate for a discussion.
 TEST_F(RenderViewHostTest, FilterAbout) {
   test_rvh()->SendNavigate(1, GURL("about:cache"));
   ASSERT_TRUE(controller().GetActiveEntry());
   EXPECT_EQ(GURL("about:blank"), controller().GetActiveEntry()->GetURL());
 }
 
@@ skipping 187 matching lines @@
   // OnInputEventAck() processing.
   IPC::Message message(0, ViewHostMsg_HandleInputEvent_ACK::ID,
                        IPC::Message::PRIORITY_NORMAL);
   test_rvh()->OnMessageReceived(message);
   EXPECT_EQ(1, process()->bad_msg_count());
 }
 
 #endif
 
 }  // namespace content