Now with unit test fixes. [Try 2 with fixes for unit tests.]

chrome/test/perf/startup_test.cc

Index: chrome/test/perf/startup_test.cc
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index a7e8166863a329713079b64cf6148efa9d0ddc97..c31bd9185b9d6140772aa1af74525a3eacb1ee55 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -468,21 +468,4 @@ TEST_F(StartupTest, ProfilingScript1) {
                  UITestBase::DEFAULT_THEME, 1, 0);
 }
 
-#if defined(TOOLKIT_GTK)
-TEST_F(StartupTest, PerfGtkTheme) {
-  RunStartupTest("warm", "gtk-theme", WARM, NOT_IMPORTANT,
-                 UITestBase::NATIVE_THEME, 0, 0);
-}
-
-TEST_F(StartupTest, PrefNativeFrame) {
-  RunStartupTest("warm", "custom-frame", WARM, NOT_IMPORTANT,
-                 UITestBase::CUSTOM_FRAME, 0, 0);
-}
-
-TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
-  RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
-                 UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
-}
-#endif
-
 }  // namespace