diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 10:55:58 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 10:55:58 +0000 |
| commit | b0a28ee99b0d3b7c237f449824ad695a61bec37b (patch) | |
| tree | 63ee34dce4291ed9313e8806ce9afbd5f226852d /webkit | |
| parent | a6ec730208e3704030f0d26afa6a7351e1b54425 (diff) | |
| download | chromium_src-b0a28ee99b0d3b7c237f449824ad695a61bec37b.zip chromium_src-b0a28ee99b0d3b7c237f449824ad695a61bec37b.tar.gz chromium_src-b0a28ee99b0d3b7c237f449824ad695a61bec37b.tar.bz2 | |
Transition to base/mac/bundle_locations.h step 1
Initial transition steps, trying to do this in small steps so it's easier to review.
foundation_util.h:
* Remove SetOverride*() methods and modify all callsites to use bundle_location.h version.
* MainAppBundle() - call through to bundle_location version as an interim step.
* Rename PathForFrameworkBundleResource() and modify callers.
* Remove one instance of [NSBundle mainBundle].
BUG=None
TEST=Chrome/Mac should launch correctly and all unit tests should pass.
Review URL: http://codereview.chromium.org/9187053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 1a11b6e..68a71d4 100644 --- a/webkit/tools/test_shell/run_all_tests.cc +++ b/webkit/tools/test_shell/run_all_tests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,6 +26,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) +#include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/path_service.h" @@ -54,7 +55,7 @@ class TestShellTestSuite : public base::TestSuite { FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.AppendASCII("TestShell.app"); - base::mac::SetOverrideAppBundlePath(path); + base::mac::SetOverrideFrameworkBundlePath(path); #endif base::TestSuite::Initialize(); |