Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Unified Diff: content/renderer/browser_plugin/browser_plugin_browsertest.h

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/test_launcher.cc ('k') | content/renderer/browser_plugin/browser_plugin_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/browser_plugin/browser_plugin_browsertest.h
===================================================================
--- content/renderer/browser_plugin/browser_plugin_browsertest.h (revision 257432)
+++ content/renderer/browser_plugin/browser_plugin_browsertest.h (working copy)
@@ -9,7 +9,6 @@
#include "base/memory/scoped_ptr.h"
#include "content/common/browser_plugin/browser_plugin_messages.h"
-#include "content/public/renderer/content_renderer_client.h"
#include "content/public/test/render_view_test.h"
#include "content/renderer/browser_plugin/mock_browser_plugin_manager.h"
#include "content/renderer/render_view_impl.h"
@@ -22,7 +21,6 @@
namespace content {
class MockBrowserPlugin;
-class TestContentRendererClient;
class BrowserPluginTest : public RenderViewTest {
public:
@@ -31,6 +29,8 @@
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
+ virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
+
MockBrowserPluginManager* browser_plugin_manager() const {
return static_cast<MockBrowserPluginManager*>(
static_cast<RenderViewImpl*>(view_)->GetBrowserPluginManager());
@@ -43,8 +43,6 @@
// Returns NULL if there is no plugin.
MockBrowserPlugin* GetCurrentPluginWithAttachParams(
BrowserPluginHostMsg_Attach_Params* params);
- private:
- scoped_ptr<TestContentRendererClient> test_content_renderer_client_;
};
} // namespace content
« no previous file with comments | « content/public/test/test_launcher.cc ('k') | content/renderer/browser_plugin/browser_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698