diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:44:36 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:44:36 +0000 |
| commit | 08da43b40e557c42b93fe490e91ab44a73d7e0dd (patch) | |
| tree | 179ee138b275abb0c9d1ccf45c5e11f8435f2b92 /chrome | |
| parent | 474e15bc5e4025a91ba857e6f0aae0affc5d7a07 (diff) | |
| download | chromium_src-08da43b40e557c42b93fe490e91ab44a73d7e0dd.zip chromium_src-08da43b40e557c42b93fe490e91ab44a73d7e0dd.tar.gz chromium_src-08da43b40e557c42b93fe490e91ab44a73d7e0dd.tar.bz2 | |
The version of gcc on mac (4.2) doesn't like inheriting from a test in an anonymous namespace. Just move the actual test cases into the namespace so everything is in the same translation unit.
TBR=evan
Review URL: http://codereview.chromium.org/113240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/startup/feature_startup_test.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc index 3ab29aa..95fb63c 100644 --- a/chrome/test/startup/feature_startup_test.cc +++ b/chrome/test/startup/feature_startup_test.cc @@ -6,7 +6,6 @@ #include "base/path_service.h" #include "base/perftimer.h" #include "base/time.h" -#include "build/build_config.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/automation/browser_proxy.h" @@ -89,12 +88,7 @@ class NewTabUIStartupTest : public UITest { } }; -} // namespace - // TODO(pamg): run these tests with a reference build? - -// TODO(tc): Fix this. -#if !defined(OS_MACOSX) TEST_F(NewTabUIStartupTest, PerfCold) { RunStartupTest("tab_cold", false /* not cold */, true /* important */); } @@ -102,4 +96,5 @@ TEST_F(NewTabUIStartupTest, PerfCold) { TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { RunStartupTest("tab_warm", true /* cold */, false /* not important */); } -#endif + +} // namespace |