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

Side by Side Diff: chrome/test/remoting/webapp_javascript_unittest.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/test/base/chrome_test_suite.cc ('k') | chrome/utility/importer/safari_importer.mm » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/path_service.h" 5 #include "base/path_service.h"
6 #include "chrome/test/remoting/qunit_browser_test_runner.h" 6 #include "chrome/test/remoting/qunit_browser_test_runner.h"
7 7
8 #if defined(OS_MACOSX) 8 #if defined(OS_MACOSX)
9 #include "base/mac/mac_util.h" 9 #include "base/mac/foundation_util.h"
10 #endif // !defined(OS_MACOSX) 10 #endif // !defined(OS_MACOSX)
11 11
12 namespace remoting { 12 namespace remoting {
13 13
14 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, Remoting_Webapp_Js_Unittest) { 14 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, Remoting_Webapp_Js_Unittest) {
15 base::FilePath base_dir; 15 base::FilePath base_dir;
16 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir)); 16 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir));
17 17
18 #if defined(OS_MACOSX) 18 #if defined(OS_MACOSX)
19 if (base::mac::AmIBundled()) { 19 if (base::mac::AmIBundled()) {
20 // If we are inside a mac bundle, navigate up to the output directory 20 // If we are inside a mac bundle, navigate up to the output directory
21 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); 21 base_dir = base::mac::GetAppBundlePath(base_dir).DirName();
22 } 22 }
23 #endif // !defined(OS_MACOSX) 23 #endif // !defined(OS_MACOSX)
24 RunTest( 24 RunTest(
25 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittest.html"))); 25 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittest.html")));
26 } 26 }
27 27
28 } // namespace remoting 28 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/utility/importer/safari_importer.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698