diff options
author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 18:55:21 +0000 |
---|---|---|
committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 18:55:21 +0000 |
commit | e4a804b3cb711d18589785c2bdfc62fec684312d (patch) | |
tree | 97d67c33bebe189239e3ac52f209141205b04417 /chrome/installer | |
parent | c5a46eeb5f47d2e19523fa87e462246c11a7d1da (diff) | |
download | chromium_src-e4a804b3cb711d18589785c2bdfc62fec684312d.zip chromium_src-e4a804b3cb711d18589785c2bdfc62fec684312d.tar.gz chromium_src-e4a804b3cb711d18589785c2bdfc62fec684312d.tar.bz2 |
Changes references to FilePath to wstring for release branch build.
BUG=none
Review URL: http://codereview.chromium.org/19717
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r-- | chrome/installer/util/google_chrome_distribution_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc index 9bb3be8..14228dd 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -185,7 +185,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { #endif TEST(MasterPreferences, ParseDistroParams) { - FilePath prefs; + std::wstring prefs; ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs)); const char text[] = "{ \n" @@ -206,8 +206,8 @@ TEST(MasterPreferences, ParseDistroParams) { " }\n" "} \n"; - EXPECT_TRUE(file_util::WriteFile(prefs.value(), text, sizeof(text))); - int result = installer_util::ParseDistributionPreferences(prefs.value()); + EXPECT_TRUE(file_util::WriteFile(prefs, text, sizeof(text))); + int result = installer_util::ParseDistributionPreferences(prefs); EXPECT_FALSE(result & installer_util::MASTER_PROFILE_NOT_FOUND); EXPECT_FALSE(result & installer_util::MASTER_PROFILE_ERROR); EXPECT_TRUE(result & installer_util::MASTER_PROFILE_NO_FIRST_RUN_UI); |