| 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 "chrome/test/base/chrome_test_suite.h" | 5 #include "chrome/test/base/chrome_test_suite.h" |
| 6 | 6 |
| 7 #if defined(OS_CHROMEOS) | 7 #if defined(OS_CHROMEOS) |
| 8 #include <stdio.h> | 8 #include <stdio.h> |
| 9 #include <unistd.h> | 9 #include <unistd.h> |
| 10 #endif | 10 #endif |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
| 35 #include "base/process/process_metrics.h" | 35 #include "base/process/process_metrics.h" |
| 36 #include "chromeos/chromeos_paths.h" | 36 #include "chromeos/chromeos_paths.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #if defined(OS_MACOSX) | 39 #if defined(OS_MACOSX) |
| 40 #include "base/mac/bundle_locations.h" | 40 #include "base/mac/bundle_locations.h" |
| 41 #include "base/mac/scoped_nsautorelease_pool.h" | 41 #include "base/mac/scoped_nsautorelease_pool.h" |
| 42 #if !defined(OS_IOS) | 42 #if !defined(OS_IOS) |
| 43 #include "base/mac/mac_util.h" | |
| 44 #include "chrome/browser/chrome_browser_application_mac.h" | 43 #include "chrome/browser/chrome_browser_application_mac.h" |
| 45 #endif // !defined(OS_IOS) | 44 #endif // !defined(OS_IOS) |
| 46 #endif | 45 #endif |
| 47 | 46 |
| 48 #if !defined(OS_IOS) | 47 #if !defined(OS_IOS) |
| 49 #include "media/base/media.h" | 48 #include "media/base/media.h" |
| 50 #endif | 49 #endif |
| 51 | 50 |
| 52 namespace { | 51 namespace { |
| 53 | 52 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 #endif | 119 #endif |
| 121 } | 120 } |
| 122 | 121 |
| 123 void ChromeTestSuite::Shutdown() { | 122 void ChromeTestSuite::Shutdown() { |
| 124 #if defined(OS_MACOSX) && !defined(OS_IOS) | 123 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 125 base::mac::SetOverrideFrameworkBundle(NULL); | 124 base::mac::SetOverrideFrameworkBundle(NULL); |
| 126 #endif | 125 #endif |
| 127 | 126 |
| 128 content::ContentTestSuiteBase::Shutdown(); | 127 content::ContentTestSuiteBase::Shutdown(); |
| 129 } | 128 } |
| OLD | NEW |