diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:36:49 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:36:49 +0000 |
| commit | ce6fded2cc25479c5991f33a8087237579dff64d (patch) | |
| tree | 93f7f787949c6f95d2f576f0c57e705320cc5cb3 /chrome_frame | |
| parent | ae353ec9c7174badba0c760a7aa603359a7b84e9 (diff) | |
| download | chromium_src-ce6fded2cc25479c5991f33a8087237579dff64d.zip chromium_src-ce6fded2cc25479c5991f33a8087237579dff64d.tar.gz chromium_src-ce6fded2cc25479c5991f33a8087237579dff64d.tar.bz2 | |
wstring: remove needless use of conversions from Chrome Frame
BUG=76112
Review URL: http://codereview.chromium.org/6673026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index e77affa..215d20a 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -290,16 +290,14 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { virtual void SetUp() { ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_)); - chrome_dll_ = dir_app_.Append(FILE_PATH_LITERAL("chrome.dll")); - chrome_exe_ = dir_app_.Append( - FilePath::FromWStringHack(chrome::kBrowserProcessExecutableName)); - chrome_frame_dll_ = dir_app_.Append(FILE_PATH_LITERAL("servers")); - chrome_frame_dll_ = chrome_frame_dll_.Append( - FilePath::FromWStringHack(kChromeFrameDllName)); - icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt.dll")); - avcodec52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avcodec-52.dll")); - avformat52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avformat-52.dll")); - avutil50_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avutil-50.dll")); + chrome_dll_ = dir_app_.Append(L"chrome.dll"); + chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName); + chrome_frame_dll_ = dir_app_.Append(L"servers"); + chrome_frame_dll_ = chrome_frame_dll_.Append(kChromeFrameDllName); + icu_dll_ = dir_app_.Append(L"icudt.dll"); + avcodec52_dll_ = dir_app_.Append(L"avcodec-52.dll"); + avformat52_dll_ = dir_app_.Append(L"avformat-52.dll"); + avutil50_dll_ = dir_app_.Append(L"avutil-50.dll"); } // TODO(iyengar) @@ -1113,7 +1111,7 @@ TEST_F(FlashCreationTest, PerfCold) { ASSERT_EQ(ERROR_SUCCESS, flash_key.ReadValue(L"", &plugin_path)); ASSERT_FALSE(plugin_path.empty()); - FilePath flash_path = FilePath::FromWStringHack(plugin_path); + FilePath flash_path = FilePath(plugin_path); FilePath binaries_to_evict[] = {flash_path}; RunStartupTest("creation_cold", "t_flash", "", true /* cold */, @@ -1134,7 +1132,7 @@ TEST_F(SilverlightCreationTest, DISABLED_PerfCold) { ASSERT_EQ(ERROR_SUCCESS, silverlight_key.ReadValue(L"", &plugin_path)); ASSERT_FALSE(plugin_path.empty()); - FilePath silverlight_path = FilePath::FromWStringHack(plugin_path); + FilePath silverlight_path = FilePath(plugin_path); FilePath binaries_to_evict[] = {silverlight_path}; RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */, |