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

Unified Diff: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

Issue 23967015: Use multi-profile mount point by default after browser crash and in Guest session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ProfileManagerTest,InputMethodPersistenceTest Created 7 years, 3 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
Index: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
index 4196c63da0b88cb4dc0cc05130b9464be079c8ca..e9b9923fa1c63f98a011383932c493b78f2a8f3e 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -25,7 +26,6 @@ namespace input_method {
namespace {
const char kInputId1[] = "xkb:us:dvorak:eng";
const char kInputId2[] = "xkb:us:colemak:eng";
-const char kProfileName[] = "input_method_test";
}
class InputMethodPersistenceTest : public testing::Test {
@@ -38,9 +38,9 @@ class InputMethodPersistenceTest : public testing::Test {
// ProfileManager::GetDefaultProfile().
ASSERT_TRUE(mock_profile_manager_.SetUp());
TestingProfile* mock_profile =
- mock_profile_manager_.CreateTestingProfile(kProfileName);
+ mock_profile_manager_.CreateTestingProfile(chrome::kTestUserProfileDir);
CommandLine *cl = CommandLine::ForCurrentProcess();
- cl->AppendSwitchASCII(switches::kLoginProfile, kProfileName);
+ cl->AppendSwitchASCII(switches::kLoginProfile, chrome::kTestUserProfileDir);
mock_profile_manager_.SetLoggedIn(true);
ProfileManager::AllowGetDefaultProfile();
EXPECT_TRUE(ProfileManager::GetDefaultProfile() != NULL);
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698