Merge 22925 - Test startup of new tab page with a complex theme....

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc	(revision 23155)
+++ chrome/test/ui/ui_test.cc	(working copy)
@@ -976,3 +976,22 @@
   }
   return false;
 }
+
+// static
+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 {
+    NOTREACHED();
+  }
+  return source_history_file;
+}
+
+
Property changes on: chrome\test\ui\ui_test.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/test/ui/ui_test.cc:r22925