summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 21:54:32 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 21:54:32 +0000
commitf7011fcb7f28651953b1765b241c974e25c8cd40 (patch)
treef3a2c97bb98cc12aaca39bb27791998f026b58b7 /chrome/browser/navigation_controller_unittest.cc
parent4663213354a9c41ab0e5a785d52bf5c9a9692514 (diff)
downloadchromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.zip
chromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.tar.gz
chromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.tar.bz2
Porting profiles to the Mac.
Review URL: http://codereview.chromium.org/19623 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller_unittest.cc')
-rw-r--r--chrome/browser/navigation_controller_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc
index 09c93e6..1019d80 100644
--- a/chrome/browser/navigation_controller_unittest.cc
+++ b/chrome/browser/navigation_controller_unittest.cc
@@ -147,7 +147,8 @@ class NavigationControllerHistoryTest : public NavigationControllerTest {
// Create a profile.
profile_manager_ = new ProfileManager();
- profile = ProfileManager::CreateProfile(profile_path_,
+ profile = ProfileManager::CreateProfile(
+ FilePath::FromWStringHack(profile_path_),
L"New Profile", L"new-profile", L"");
ASSERT_TRUE(profile);
profile_manager_->AddProfile(profile);
@@ -189,8 +190,10 @@ class NavigationControllerHistoryTest : public NavigationControllerTest {
helper_.set_service(NULL);
delete profile_manager_;
profile_manager_ = new ProfileManager();
- profile_manager_->AddProfileByPath(profile_path_);
- profile = profile_manager_->GetProfileByPath(profile_path_);
+ profile_manager_->AddProfileByPath(
+ FilePath::FromWStringHack(profile_path_));
+ profile = profile_manager_->GetProfileByPath(
+ FilePath::FromWStringHack(profile_path_));
helper_.set_service(profile->GetSessionService());
}