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

Side by Side Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/shared_memory.h" 7 #include "base/shared_memory.h"
8 #include "base/timer.h" 8 #include "base/timer.h"
9 #include "content/browser/browser_thread.h" 9 #include "content/browser/browser_thread.h"
10 #include "content/browser/renderer_host/backing_store.h" 10 #include "content/browser/renderer_host/backing_store.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 private: 239 private:
240 MockRenderWidgetHost* host_; 240 MockRenderWidgetHost* host_;
241 int tag_; 241 int tag_;
242 gfx::Size size_; 242 gfx::Size size_;
243 }; 243 };
244 244
245 245
246 // RenderWidgetHostTest -------------------------------------------------------- 246 // RenderWidgetHostTest --------------------------------------------------------
247 247
248 class RenderWidgetHostTest : public TestingBrowserProcessTest { 248 class RenderWidgetHostTest : public testing::Test {
249 public: 249 public:
250 RenderWidgetHostTest() : process_(NULL) { 250 RenderWidgetHostTest() : process_(NULL) {
251 } 251 }
252 ~RenderWidgetHostTest() { 252 ~RenderWidgetHostTest() {
253 } 253 }
254 254
255 protected: 255 protected:
256 // testing::Test 256 // testing::Test
257 void SetUp() { 257 void SetUp() {
258 browser_context_.reset(new TestBrowserContext()); 258 browser_context_.reset(new TestBrowserContext());
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 // Start it again to ensure it still works. 727 // Start it again to ensure it still works.
728 EXPECT_FALSE(host_->unresponsive_timer_fired()); 728 EXPECT_FALSE(host_->unresponsive_timer_fired());
729 host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10)); 729 host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
730 730
731 // Wait long enough for first timeout and see if it fired. 731 // Wait long enough for first timeout and see if it fired.
732 MessageLoop::current()->PostDelayedTask(FROM_HERE, 732 MessageLoop::current()->PostDelayedTask(FROM_HERE,
733 new MessageLoop::QuitTask(), 10); 733 new MessageLoop::QuitTask(), 10);
734 MessageLoop::current()->Run(); 734 MessageLoop::current()->Run();
735 EXPECT_TRUE(host_->unresponsive_timer_fired()); 735 EXPECT_TRUE(host_->unresponsive_timer_fired());
736 } 736 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698