diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 16:29:42 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 16:29:42 +0000 |
commit | 88dc06904f5ebf68d962ac3e5c7a77ca64ac4ec0 (patch) | |
tree | 136274bffa099a690e9195c7ba9c271bd90cf085 /chrome/browser/extensions/extension_menu_manager_unittest.cc | |
parent | b1d08c68cf8cc377fa6250642cf668dc67bda05d (diff) | |
download | chromium_src-88dc06904f5ebf68d962ac3e5c7a77ca64ac4ec0.zip chromium_src-88dc06904f5ebf68d962ac3e5c7a77ca64ac4ec0.tar.gz chromium_src-88dc06904f5ebf68d962ac3e5c7a77ca64ac4ec0.tar.bz2 |
Convert more wide strings in browser/extensions.
I think this kills off the remaining uses of the now-deprecated wstring
DictionaryValue methods.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3125010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/extension_menu_manager_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 4955930..c0ad8d9 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -443,22 +443,21 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) { ASSERT_TRUE(list->GetDictionary(0, &info)); int tmp_id = 0; - ASSERT_TRUE(info->GetInteger(L"menuItemId", &tmp_id)); + ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id)); ASSERT_EQ(id.second, tmp_id); std::string tmp; - ASSERT_TRUE(info->GetString(L"mediaType", &tmp)); + ASSERT_TRUE(info->GetString("mediaType", &tmp)); ASSERT_EQ("image", tmp); - ASSERT_TRUE(info->GetString(L"srcUrl", &tmp)); + ASSERT_TRUE(info->GetString("srcUrl", &tmp)); ASSERT_EQ(params.src_url.spec(), tmp); - ASSERT_TRUE(info->GetString(L"pageUrl", &tmp)); + ASSERT_TRUE(info->GetString("pageUrl", &tmp)); ASSERT_EQ(params.page_url.spec(), tmp); - std::wstring wide_tmp; - ASSERT_TRUE(info->GetString(L"selectionText", &wide_tmp)); - ASSERT_EQ(params.selection_text, wide_tmp); + ASSERT_TRUE(info->GetString("selectionText", &tmp)); + ASSERT_EQ(WideToUTF8(params.selection_text), tmp); bool bool_tmp = true; - ASSERT_TRUE(info->GetBoolean(L"editable", &bool_tmp)); + ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp)); ASSERT_EQ(params.is_editable, bool_tmp); } |