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

Unified Diff: chrome/test/ui/ui_test.cc

Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 5 months 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 | « chrome/test/perf/startup_test.cc ('k') | chromeos/dbus/mock_dbus_thread_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index f5eae5abbff2eb06acfc78e0e6cad0ddbfd25276..be708eaee28a8ac3c595e8803483a912dc82f3ca 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -46,6 +46,7 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/base/chrome_process_util.h"
+#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/test_switches.h"
#include "content/common/debug_flags.h"
#include "googleurl/src/gurl.h"
@@ -584,7 +585,7 @@ DictionaryValue* UITest::GetLocalState() {
DictionaryValue* UITest::GetDefaultProfilePreferences() {
FilePath path;
PathService::Get(chrome::DIR_USER_DATA, &path);
- path = path.AppendASCII(chrome::kInitialProfile);
+ path = path.AppendASCII(TestingProfile::kTestUserProfileDir);
return LoadDictionaryValueFromPath(path.Append(chrome::kPreferencesFilename));
}
« no previous file with comments | « chrome/test/perf/startup_test.cc ('k') | chromeos/dbus/mock_dbus_thread_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698