summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_thread.cc7
-rw-r--r--chrome/renderer/render_thread_unittest.cc4
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 7a5a8be..80811b2 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -87,14 +87,12 @@ class SuicideOnChannelErrorFilter : public IPC::ChannelProxy::MessageFilter {
// When we run plugins in process, we actually run them on the render thread,
// which means that we need to make the render thread pump UI events.
-RenderThread::RenderThread()
- : plugin_refresh_allowed_(true) {
+RenderThread::RenderThread() {
Init();
}
RenderThread::RenderThread(const std::string& channel_name)
- : plugin_refresh_allowed_(true) {
- SetChannelName(channel_name);
+ : ChildThread(channel_name) {
Init();
}
@@ -107,6 +105,7 @@ void RenderThread::Init() {
CoInitialize(0);
#endif
+ plugin_refresh_allowed_ = true;
cache_stats_factory_.reset(
new ScopedRunnableMethodFactory<RenderThread>(this));
diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index 711cc42..aa370a5 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -40,11 +40,11 @@ class RenderThreadTest : public testing::Test {
IPC::Channel *channel_;
};
-TEST_F(RenderThreadTest, DISABLED_TestGlobal) {
+TEST_F(RenderThreadTest, TestGlobal) {
ASSERT_TRUE(RenderThread::current());
}
-TEST_F(RenderThreadTest, DISABLED_TestVisitedMsg) {
+TEST_F(RenderThreadTest, TestVisitedMsg) {
#if defined(OS_WIN)
IPC::Message* msg = new ViewMsg_VisitedLink_NewTable(NULL);
#elif defined(OS_POSIX)