| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "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 "content/browser/mock_content_browser_client.h" | |
| 9 #include "content/public/test/test_content_client_initializer.h" | 8 #include "content/public/test/test_content_client_initializer.h" |
| 10 #include "content/test/test_content_client.h" | 9 #include "content/test/test_content_client.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 11 |
| 13 #if defined(USE_AURA) | 12 #if defined(USE_AURA) |
| 14 #include "ui/aura/test/test_aura_initializer.h" | 13 #include "ui/aura/test/test_aura_initializer.h" |
| 15 #endif | 14 #endif |
| 16 | 15 |
| 17 #if defined(OS_MACOSX) | 16 #if defined(OS_MACOSX) |
| 18 #include "base/mac/scoped_nsautorelease_pool.h" | 17 #include "base/mac/scoped_nsautorelease_pool.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 testing::TestEventListeners& listeners = | 63 testing::TestEventListeners& listeners = |
| 65 testing::UnitTest::GetInstance()->listeners(); | 64 testing::UnitTest::GetInstance()->listeners(); |
| 66 listeners.Append(new TestInitializationListener); | 65 listeners.Append(new TestInitializationListener); |
| 67 } | 66 } |
| 68 | 67 |
| 69 ContentClient* ContentTestSuite::CreateClientForInitialization() { | 68 ContentClient* ContentTestSuite::CreateClientForInitialization() { |
| 70 return new TestContentClient(); | 69 return new TestContentClient(); |
| 71 } | 70 } |
| 72 | 71 |
| 73 } // namespace content | 72 } // namespace content |
| OLD | NEW |