Commit 16892aca authored by jochen@chromium.org's avatar jochen@chromium.org

Move TextInputClientMacTest to content_unittests

BUG=10502
TEST=content_unittests


Review URL: http://codereview.chromium.org/8679020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111527 0039d316-1c4b-4281-b951-d872f2087c98
parent 6b0a3940
...@@ -2008,7 +2008,6 @@ ...@@ -2008,7 +2008,6 @@
'test/data/unit/framework_unittest.gtestjs', 'test/data/unit/framework_unittest.gtestjs',
'tools/convert_dict/convert_dict_unittest.cc', 'tools/convert_dict/convert_dict_unittest.cc',
'../content/browser/renderer_host/render_widget_host_unittest.cc', '../content/browser/renderer_host/render_widget_host_unittest.cc',
'../content/browser/renderer_host/text_input_client_mac_unittest.mm',
'../content/browser/tab_contents/navigation_controller_unittest.cc', '../content/browser/tab_contents/navigation_controller_unittest.cc',
'../content/browser/tab_contents/render_view_host_manager_unittest.cc', '../content/browser/tab_contents/render_view_host_manager_unittest.cc',
'../content/common/sandbox_mac_diraccess_unittest.mm', '../content/common/sandbox_mac_diraccess_unittest.mm',
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/renderer_host/mock_render_process_host.h"
#include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host.h"
#include "content/browser/renderer_host/text_input_client_message_filter.h" #include "content/browser/renderer_host/text_input_client_message_filter.h"
#include "content/common/text_input_client_messages.h" #include "content/common/text_input_client_messages.h"
#include "content/test//test_browser_context.h"
#include "ipc/ipc_test_sink.h" #include "ipc/ipc_test_sink.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h" #include "testing/gtest_mac.h"
...@@ -28,9 +28,9 @@ class TextInputClientMacTest : public testing::Test { ...@@ -28,9 +28,9 @@ class TextInputClientMacTest : public testing::Test {
public: public:
TextInputClientMacTest() TextInputClientMacTest()
: message_loop_(MessageLoop::TYPE_UI), : message_loop_(MessageLoop::TYPE_UI),
profile_(), browser_context_(),
process_factory_(), process_factory_(),
widget_(process_factory_.CreateRenderProcessHost(&profile_), 1), widget_(process_factory_.CreateRenderProcessHost(&browser_context_), 1),
thread_("TextInputClientMacTestThread") {} thread_("TextInputClientMacTestThread") {}
// Accessor for the TextInputClientMac instance. // Accessor for the TextInputClientMac instance.
...@@ -57,7 +57,7 @@ class TextInputClientMacTest : public testing::Test { ...@@ -57,7 +57,7 @@ class TextInputClientMacTest : public testing::Test {
friend class ScopedTestingThread; friend class ScopedTestingThread;
MessageLoop message_loop_; MessageLoop message_loop_;
TestingProfile profile_; TestBrowserContext browser_context_;
// Gets deleted when the last RWH in the "process" gets destroyed. // Gets deleted when the last RWH in the "process" gets destroyed.
MockRenderProcessHostFactory process_factory_; MockRenderProcessHostFactory process_factory_;
......
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
'browser/renderer_host/render_widget_host_view_mac_unittest.mm', 'browser/renderer_host/render_widget_host_view_mac_unittest.mm',
'browser/renderer_host/resource_dispatcher_host_unittest.cc', 'browser/renderer_host/resource_dispatcher_host_unittest.cc',
'browser/renderer_host/resource_queue_unittest.cc', 'browser/renderer_host/resource_queue_unittest.cc',
'browser/renderer_host/text_input_client_mac_unittest.mm',
'browser/resolve_proxy_msg_helper_unittest.cc', 'browser/resolve_proxy_msg_helper_unittest.cc',
'browser/site_instance_unittest.cc', 'browser/site_instance_unittest.cc',
'browser/speech/endpointer/endpointer_unittest.cc', 'browser/speech/endpointer/endpointer_unittest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment