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

Unified Diff: content/public/test/render_view_test.h

Issue 1501343002: Prepare chrome to use the new Mojo EDK by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable turning on in this cl Created 5 years 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
Index: content/public/test/render_view_test.h
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index 205ce219323b8d8da0d226b2b424f9f8007f19b0..545c620ee5ccd003c41b565d3bcc441c2644120c 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -10,7 +10,8 @@
#include "base/command_line.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/strings/string16.h"
+#include "base/strings/string16.h"
+#include "base/test/test_io_thread.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/page_state.h"
@@ -18,7 +19,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/Platform.h"
#include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebLeakDetector.h"
+#include "third_party/WebKit/public/web/WebLeakDetector.h"
+#include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
struct ViewMsg_Resize_Params;
@@ -194,6 +196,10 @@ class RenderViewTest : public testing::Test, blink::WebLeakDetectorClient {
scoped_ptr<MainFunctionParams> params_;
scoped_ptr<base::CommandLine> command_line_;
+ // For Mojo.
+ scoped_ptr<base::TestIOThread> test_io_thread_;
+ scoped_ptr<mojo::test::ScopedIPCSupport> ipc_support_;
+
#if defined(OS_MACOSX)
scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
#endif

Powered by Google App Engine
This is Rietveld 408576698