summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 18:35:42 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 18:35:42 +0000
commit4f260d0c40e2b63d2af72d667ca5b0518c2dff84 (patch)
tree2c976dd8b8dc5c217646627205e61728e8891b03 /chrome_frame/test
parentb3ae5db129f88dae153880e84bdabea8ce2ca89b (diff)
downloadchromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.zip
chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.gz
chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.bz2
Update file version info/memory details/process utils to use string16.
BUG=23581 TEST=everything still works Review URL: http://codereview.chromium.org/5968008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc3
-rw-r--r--chrome_frame/test/util_unittests.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 3afdadf..adc681e 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -158,7 +158,8 @@ class PageLoadTest : public testing::Test {
// Check file version info for chrome dll.
scoped_ptr<FileVersionInfo> file_info;
#if defined(OS_WIN)
- file_info.reset(FileVersionInfo::CreateFileVersionInfo(kChromeDll));
+ file_info.reset(
+ FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll)));
#elif defined(OS_LINUX) || defined(OS_MACOSX)
// TODO(fmeawad): the version retrieved here belongs to the test module and
// not the chrome binary, need to be changed to chrome binary instead.
diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc
index ac4bccf..9cdf9f6 100644
--- a/chrome_frame/test/util_unittests.cc
+++ b/chrome_frame/test/util_unittests.cc
@@ -58,7 +58,7 @@ TEST_F(UtilTests, GetModuleVersionTest) {
// Use the method that goes to disk
scoped_ptr<FileVersionInfo> base_info(
- FileVersionInfo::CreateFileVersionInfo(path));
+ FileVersionInfo::CreateFileVersionInfo(FilePath(path)));
EXPECT_TRUE(base_info.get() != NULL);
// Use the method that doesn't go to disk