Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3810)

Unified Diff: chrome/browser/importer/importer_unittest.cc

Issue 9416: Make the test "pass" when the internal data is not found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/importer_unittest.cc
===================================================================
--- chrome/browser/importer/importer_unittest.cc (revision 4779)
+++ chrome/browser/importer/importer_unittest.cc (working copy)
@@ -597,6 +597,10 @@
std::wstring data_path;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox2_profile\\*");
+ if (!file_util::PathExists(data_path)) {
+ LOG(ERROR) << L"Missing internal test data";
+ return;
+ }
file_util::CopyDirectory(data_path, profile_path_, true);
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox2_nss");
@@ -792,6 +796,10 @@
std::wstring data_path;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox3_profile\\*");
+ if (!file_util::PathExists(data_path)) {
+ LOG(ERROR) << L"Missing internal test data";
+ return;
+ }
file_util::CopyDirectory(data_path, profile_path_, true);
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox3_nss");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698