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

Unified Diff: cc/test/layer_tree_test.h

Issue 17114008: cc: Remove cc::Thread and cc::ThreadImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm-thread: clarify threads in UpdateBackgroundAnimateTicking, test asserts Created 7 years, 6 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
Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 856caaae6c841d3c035fddd010c4b1a97b360c5d..4d026caa8e9b85a791956653ebfa602b97e4a0ff 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -7,7 +7,6 @@
#include "base/memory/ref_counted.h"
#include "base/threading/thread.h"
-#include "cc/base/thread.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_host_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -140,7 +139,10 @@ class LayerTreeTest : public testing::Test, public TestHooks {
bool delegating_renderer,
bool impl_side_painting);
- Thread* ImplThread() { return proxy() ? proxy()->ImplThread() : NULL; }
+ bool HasImplThread() { return proxy() ? proxy()->HasImplThread() : false; }
+ base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
+ return proxy() ? proxy()->ImplThreadTaskRunner() : NULL;
+ }
Proxy* proxy() const {
return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
}
@@ -172,7 +174,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
int timeout_seconds_;
- scoped_ptr<Thread> main_ccthread_;
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
scoped_ptr<base::Thread> impl_thread_;
base::CancelableClosure timeout_;
base::WeakPtr<LayerTreeTest> main_thread_weak_ptr_;

Powered by Google App Engine
This is Rietveld 408576698