| 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 "gfx/test_suite.h" | 5 #include "ui/gfx/test_suite.h" |
| 6 | 6 |
| 7 #include "gfx/gfx_paths.h" | |
| 8 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 9 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 10 #include "base/mac/scoped_nsautorelease_pool.h" | 9 #include "base/mac/scoped_nsautorelease_pool.h" |
| 10 #include "ui/gfx/gfx_paths.h" |
| 11 | 11 |
| 12 #if defined(OS_MACOSX) | 12 #if defined(OS_MACOSX) |
| 13 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 GfxTestSuite::GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} | 16 GfxTestSuite::GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} |
| 17 | 17 |
| 18 void GfxTestSuite::Initialize() { | 18 void GfxTestSuite::Initialize() { |
| 19 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 19 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
| 20 | 20 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 39 base::mac::SetOverrideAppBundlePath(path); | 39 base::mac::SetOverrideAppBundlePath(path); |
| 40 #endif // OS_MACOSX | 40 #endif // OS_MACOSX |
| 41 } | 41 } |
| 42 | 42 |
| 43 void GfxTestSuite::Shutdown() { | 43 void GfxTestSuite::Shutdown() { |
| 44 #if defined(OS_MACOSX) | 44 #if defined(OS_MACOSX) |
| 45 base::mac::SetOverrideAppBundle(NULL); | 45 base::mac::SetOverrideAppBundle(NULL); |
| 46 #endif | 46 #endif |
| 47 TestSuite::Shutdown(); | 47 TestSuite::Shutdown(); |
| 48 } | 48 } |
| OLD | NEW |