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

Side by Side Diff: cc/resources/resource_update_controller_unittest.cc

Issue 50303007: Move test-only stuff from cc/debug/ to cc/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fold cc_test_utils into cc_test_support to fix windows link Created 7 years, 1 month 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/resources/resource_update_controller.h" 5 #include "cc/resources/resource_update_controller.h"
6 6
7 #include "base/test/test_simple_task_runner.h" 7 #include "base/test/test_simple_task_runner.h"
8 #include "cc/debug/test_web_graphics_context_3d.h"
9 #include "cc/resources/prioritized_resource_manager.h" 8 #include "cc/resources/prioritized_resource_manager.h"
10 #include "cc/test/fake_output_surface.h" 9 #include "cc/test/fake_output_surface.h"
11 #include "cc/test/fake_output_surface_client.h" 10 #include "cc/test/fake_output_surface_client.h"
12 #include "cc/test/fake_proxy.h" 11 #include "cc/test/fake_proxy.h"
13 #include "cc/test/scheduler_test_common.h" 12 #include "cc/test/scheduler_test_common.h"
13 #include "cc/test/test_web_graphics_context_3d.h"
14 #include "cc/test/tiled_layer_test_common.h" 14 #include "cc/test/tiled_layer_test_common.h"
15 #include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread 15 #include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "third_party/khronos/GLES2/gl2ext.h" 17 #include "third_party/khronos/GLES2/gl2ext.h"
18 18
19 using testing::Test; 19 using testing::Test;
20 using WebKit::WGC3Denum; 20 using WebKit::WGC3Denum;
21 using WebKit::WGC3Dint; 21 using WebKit::WGC3Dint;
22 using WebKit::WGC3Duint; 22 using WebKit::WGC3Duint;
23 using WebKit::WGC3Dsizei; 23 using WebKit::WGC3Dsizei;
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 RunPendingTask(task_runner.get(), controller.get()); 510 RunPendingTask(task_runner.get(), controller.get());
511 } 511 }
512 512
513 EXPECT_FALSE(task_runner->HasPendingTask()); 513 EXPECT_FALSE(task_runner->HasPendingTask());
514 EXPECT_TRUE(client.ReadyToFinalizeCalled()); 514 EXPECT_TRUE(client.ReadyToFinalizeCalled());
515 EXPECT_EQ(2, num_total_uploads_); 515 EXPECT_EQ(2, num_total_uploads_);
516 } 516 }
517 517
518 } // namespace 518 } // namespace
519 } // namespace cc 519 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/resources/texture_mailbox_deleter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698