| Index: chrome/test/ui/ui_test.cc
|
| diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
|
| index 624fdfb5918a0a90b93e1742577c205a6574999c..55cdc564cb179e2dce51e3c0ce49c7b58588b36c 100644
|
| --- a/chrome/test/ui/ui_test.cc
|
| +++ b/chrome/test/ui/ui_test.cc
|
| @@ -19,6 +19,7 @@
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| #include "base/json/json_file_value_serializer.h"
|
| +#include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/path_service.h"
|
| #include "base/process_util.h"
|
| @@ -419,24 +420,19 @@ FilePath UITestBase::ComputeTypicalUserDataSource(
|
| source_history_file = source_history_file.AppendASCII("profiles");
|
| switch (profile_type) {
|
| case UITestBase::DEFAULT_THEME:
|
| - source_history_file = source_history_file.AppendASCII("typical_history");
|
| + source_history_file = source_history_file.AppendASCII(
|
| + "profile_with_default_theme");
|
| break;
|
| case UITestBase::COMPLEX_THEME:
|
| - source_history_file = source_history_file.AppendASCII("complex_theme");
|
| - break;
|
| - case UITestBase::NATIVE_THEME:
|
| - source_history_file = source_history_file.AppendASCII("gtk_theme");
|
| - break;
|
| - case UITestBase::CUSTOM_FRAME:
|
| - source_history_file = source_history_file.AppendASCII("custom_frame");
|
| - break;
|
| - case UITestBase::CUSTOM_FRAME_NATIVE_THEME:
|
| - source_history_file =
|
| - source_history_file.AppendASCII("custom_frame_gtk_theme");
|
| + source_history_file = source_history_file.AppendASCII(
|
| + "profile_with_complex_theme");
|
| break;
|
| default:
|
| NOTREACHED();
|
| }
|
| +
|
| + DCHECK(file_util::PathExists(source_history_file));
|
| +
|
| return source_history_file;
|
| }
|
|
|
|
|