More linux startup tests. Add startup tests for custom frame

and custom frame + gtk theme.

By default, we try to detect custom frame or not based on the
window manager.  On the bots, we run the startup tests in Xvfb
with no window manager running, so they don't get the custom
frame.

Review URL: http://codereview.chromium.org/174032


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23778 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 68 insertions, 12 deletions

diff --git a/chrome/test/data/profiles/custom_frame/Default/Cookies b/chrome/test/data/profiles/custom_frame/Default/Cookies
new file mode 100644
index 0000000..e138f7c
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/Cookies
diff --git a/chrome/test/data/profiles/custom_frame/Default/Full Text Index b/chrome/test/data/profiles/custom_frame/Default/Full Text Index
new file mode 100644
index 0000000..65ea2f6
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/Full Text Index
diff --git a/chrome/test/data/profiles/custom_frame/Default/History b/chrome/test/data/profiles/custom_frame/Default/History
new file mode 100644
index 0000000..b3d68c7
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/History
diff --git a/chrome/test/data/profiles/custom_frame/Default/Preferences b/chrome/test/data/profiles/custom_frame/Default/Preferences
new file mode 100644
index 0000000..26dc297
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/Preferences
@@ -0,0 +1,14 @@
+{
+   "browser": {
+      "custom_chrome_frame": true
+   },
+   "profile": {
+      "exited_cleanly": true,
+      "id": "not-signed-in",
+      "name": "Not Signed In",
+      "nickname": "not-signed-in"
+   },
+   "spellcheck": {
+      "dictionary": "en-US"
+   }
+}
diff --git a/chrome/test/data/profiles/custom_frame/Default/Thumbnails b/chrome/test/data/profiles/custom_frame/Default/Thumbnails
new file mode 100644
index 0000000..fc26118
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/Thumbnails
diff --git a/chrome/test/data/profiles/custom_frame/Default/Visited Links b/chrome/test/data/profiles/custom_frame/Default/Visited Links
new file mode 100644
index 0000000..2fa35a9
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame/Default/Visited Links
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies
new file mode 100644
index 0000000..e138f7c
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index
new file mode 100644
index 0000000..65ea2f6
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History
new file mode 100644
index 0000000..b3d68c7
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences
new file mode 100644
index 0000000..c1cad69
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences
@@ -0,0 +1,19 @@
+{
+   "browser": {
+      "custom_chrome_frame": true
+   },
+   "extensions": {
+      "theme": {
+          "use_system": true
+      }
+   },
+   "profile": {
+      "exited_cleanly": true,
+      "id": "not-signed-in",
+      "name": "Not Signed In",
+      "nickname": "not-signed-in"
+   },
+   "spellcheck": {
+      "dictionary": "en-US"
+   }
+}
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails
new file mode 100644
index 0000000..fc26118
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links
new file mode 100644
index 0000000..2fa35a9
--- /dev/null
+++ b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index e253817..1d98ca8 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -120,6 +120,18 @@ TEST_F(NewTabUIStartupTest, GtkThemeCold) {
                  false /* not important */,
                  UITest::NATIVE_THEME);
 }
+
+TEST_F(NewTabUIStartupTest, NativeFrameCold) {
+  RunStartupTest("tab_custom_frame_cold", false /* cold */,
+                 false /* not important */,
+                 UITest::CUSTOM_FRAME);
+}
+
+TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) {
+  RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */,
+                 false /* not important */,
+                 UITest::CUSTOM_FRAME_NATIVE_THEME);
+}
 #endif
 
 }  // namespace
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 97d22fa..8ddf22a 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -1013,17 +1013,26 @@ FilePath UITest::ComputeTypicalUserDataSource(int profile_type) {
   FilePath source_history_file;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA,
                                &source_history_file));
-  if (profile_type == UITest::DEFAULT_THEME) {
-    source_history_file = source_history_file.AppendASCII("profiles")
-        .AppendASCII("typical_history");
-  } else if (profile_type == UITest::COMPLEX_THEME) {
-    source_history_file = source_history_file.AppendASCII("profiles")
-        .AppendASCII("complex_theme");
-  } else if (profile_type == UITest::NATIVE_THEME) {
-    source_history_file = source_history_file.AppendASCII("profiles")
-        .AppendASCII("gtk_theme");
-  } else {
-    NOTREACHED();
+  source_history_file = source_history_file.AppendASCII("profiles");
+  switch (profile_type) {
+    case UITest::DEFAULT_THEME:
+      source_history_file = source_history_file.AppendASCII("typical_history");
+      break;
+    case UITest::COMPLEX_THEME:
+      source_history_file = source_history_file.AppendASCII("complex_theme");
+      break;
+    case UITest::NATIVE_THEME:
+      source_history_file = source_history_file.AppendASCII("gtk_theme");
+      break;
+    case UITest::CUSTOM_FRAME:
+      source_history_file = source_history_file.AppendASCII("custom_frame");
+      break;
+    case UITest::CUSTOM_FRAME_NATIVE_THEME:
+      source_history_file =
+          source_history_file.AppendASCII("custom_frame_gtk_theme");
+      break;
+    default:
+      NOTREACHED();
   }
   return source_history_file;
 }
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 8568822..0a7142f 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -422,7 +422,9 @@ class UITest : public testing::Test {
   enum {
     DEFAULT_THEME = 0,
     COMPLEX_THEME = 1,
-    NATIVE_THEME = 2
+    NATIVE_THEME = 2,
+    CUSTOM_FRAME = 3,
+    CUSTOM_FRAME_NATIVE_THEME = 4,
   } ProfileType;
 
  private: