| Index: chrome/browser/default_plugin_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/default_plugin_uitest.cc (revision 73805)
|
| +++ chrome/browser/default_plugin_uitest.cc (working copy)
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/file_path.h"
|
| +#include "base/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| #include "chrome/test/automation/tab_proxy.h"
|
| #include "chrome/test/ui/ui_test.h"
|
| @@ -30,9 +31,9 @@
|
| // Check that the default plugin was loaded. It executes a bit of javascript
|
| // in the HTML file which replaces the innerHTML of div |result| with "DONE".
|
| scoped_refptr<TabProxy> tab(GetActiveTab());
|
| - std::wstring out;
|
| - ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
|
| - L"domAutomationController.send("
|
| - L"document.getElementById('result').innerHTML)", &out));
|
| - ASSERT_EQ(L"DONE", out);
|
| + string16 out;
|
| + ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
|
| + ASCIIToUTF16("domAutomationController.send("
|
| + "document.getElementById('result').innerHTML)"), &out));
|
| + ASSERT_EQ(ASCIIToUTF16("DONE"), out);
|
| }
|
|
|