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

Side by Side Diff: chrome/test/base/chrome_test_suite.cc

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « chrome/common/mac/launchd.mm ('k') | chrome/test/remoting/webapp_javascript_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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 }
OLDNEW
« no previous file with comments | « chrome/common/mac/launchd.mm ('k') | chrome/test/remoting/webapp_javascript_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698