OLD | NEW |
---|---|
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 "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "content/browser/mock_content_browser_client.h" | 9 #include "content/browser/mock_content_browser_client.h" |
10 #include "content/browser/notification_service_impl.h" | 10 #include "content/browser/notification_service_impl.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
82 #if defined(USE_WEBKIT_COMPOSITOR) | 82 #if defined(USE_WEBKIT_COMPOSITOR) |
83 ui::SetupTestCompositor(); | 83 ui::SetupTestCompositor(); |
84 #else | 84 #else |
85 ui::gfx_test_utils::SetupTestCompositor(); | 85 ui::gfx_test_utils::SetupTestCompositor(); |
86 #endif | 86 #endif |
87 | 87 |
88 testing::TestEventListeners& listeners = | 88 testing::TestEventListeners& listeners = |
89 testing::UnitTest::GetInstance()->listeners(); | 89 testing::UnitTest::GetInstance()->listeners(); |
90 listeners.Append(new TestContentClientInitializer); | 90 listeners.Append(new TestContentClientInitializer); |
91 } | 91 } |
92 | |
piman
2012/01/23 23:38:30
Note: whitespace to force a recompile on windows,
| |
OLD | NEW |