diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 19:52:52 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 19:52:52 +0000 |
| commit | 7fac888e97750567424c1ededd1c6c3957dddaa6 (patch) | |
| tree | 194dd4c1cc4520775b42e56b619c414782049a3f /chrome/test/in_process_browser_test.cc | |
| parent | 490348b9600fd16e8ae14b32b78a9b9f3613fd6c (diff) | |
| download | chromium_src-7fac888e97750567424c1ededd1c6c3957dddaa6.zip chromium_src-7fac888e97750567424c1ededd1c6c3957dddaa6.tar.gz chromium_src-7fac888e97750567424c1ededd1c6c3957dddaa6.tar.bz2 | |
Mac: Let out-of-process tests run in bundled mode for their whole lifetime.
Since out-of-process tests override the EXE path to look like the bundled app, it makes sense to override AmIBundled() as well.
This is important because the renderer process started from browser_tests runs as bundled, and if browser and renderer process don't agree on bundled-ness, the "load plugin" requests for internal plugins from the renderer have the wrong plugin path, causing the plugin load to fail.
Also add a DCHECK that makes sure that AmIBundled() doesn't flip-flop.
This makes PDFBrowserTest work on mac, so enable it.
It looks like even unit_tests uses the out-of-process test runner, so this change is a bit hairy :-/
BUG=61258,63183
TEST=all existing tests still pass, PDFBrowserTest.* passes.
Review URL: http://codereview.chromium.org/4947002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index cd6669f..78781fc 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -43,14 +43,18 @@ #include "net/test/test_server.h" #include "sandbox/src/dep.h" -#if defined(OS_WIN) -#include "chrome/browser/views/frame/browser_view.h" -#endif - #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" #endif // defined(OS_CHROMEOS) +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#endif + +#if defined(OS_WIN) +#include "chrome/browser/views/frame/browser_view.h" +#endif + namespace { void InitializeBrowser(Browser* browser) { @@ -75,12 +79,32 @@ static const char kBrowserTestType[] = "browser"; InProcessBrowserTest::InProcessBrowserTest() : browser_(NULL), - test_server_(net::TestServer::TYPE_HTTP, - FilePath(FILE_PATH_LITERAL("chrome/test/data"))), show_window_(false), dom_automation_enabled_(false), tab_closeable_state_watcher_enabled_(false), original_single_process_(false) { +#if defined(OS_MACOSX) + mac_util::SetOverrideAmIBundled(true); +#endif + + // Before we run the browser, we have to hack the path to the exe to match + // what it would be if Chrome was running, because it is used to fork renderer + // processes, on Linux at least (failure to do so will cause a browser_test to + // be run instead of a renderer). + FilePath chrome_path; + CHECK(PathService::Get(base::FILE_EXE, &chrome_path)); + chrome_path = chrome_path.DirName(); +#if defined(OS_WIN) + chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath); +#elif defined(OS_POSIX) + chrome_path = chrome_path.Append( + WideToASCII(chrome::kBrowserProcessExecutablePath)); +#endif + CHECK(PathService::Override(base::FILE_EXE, chrome_path)); + + test_server_.reset(new net::TestServer( + net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data")))); } InProcessBrowserTest::~InProcessBrowserTest() { @@ -154,9 +178,6 @@ void InProcessBrowserTest::SetUp() { // they'll try to use browser_tests which doesn't contain ChromeMain. FilePath subprocess_path; PathService::Get(base::FILE_EXE, &subprocess_path); - subprocess_path = subprocess_path.DirName(); - subprocess_path = subprocess_path.AppendASCII(WideToASCII( - chrome::kBrowserProcessExecutablePath)); #if defined(OS_MACOSX) // Recreate the real environment, run the helper within the app bundle. subprocess_path = subprocess_path.DirName().DirName(); @@ -205,21 +226,6 @@ void InProcessBrowserTest::SetUp() { SetUpInProcessBrowserTestFixture(); - // Before we run the browser, we have to hack the path to the exe to match - // what it would be if Chrome was running, because it is used to fork renderer - // processes, on Linux at least (failure to do so will cause a browser_test to - // be run instead of a renderer). - FilePath chrome_path; - CHECK(PathService::Get(base::FILE_EXE, &chrome_path)); - chrome_path = chrome_path.DirName(); -#if defined(OS_WIN) - chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath); -#elif defined(OS_POSIX) - chrome_path = chrome_path.Append( - WideToASCII(chrome::kBrowserProcessExecutablePath)); -#endif - CHECK(PathService::Override(base::FILE_EXE, chrome_path)); - BrowserMain(params); TearDownInProcessBrowserTestFixture(); } |