| Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| index 9e48a49647d815bda7b12fc0086e5e29890f34ac..d8307fb12c632b13ae3f4ae9166b13847a1a9d27 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| @@ -953,7 +953,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, InputMethod) {
|
| {
|
| ExecuteSyncJSFunction(guest_rvh,
|
| "document.getElementById('input1').focus();");
|
| - string16 expected_title = UTF8ToUTF16("InputTest123");
|
| + base::string16 expected_title = UTF8ToUTF16("InputTest123");
|
| content::TitleWatcher title_watcher(test_guest()->web_contents(),
|
| expected_title);
|
| embedder_rvh->Send(
|
| @@ -967,7 +967,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, InputMethod) {
|
| }
|
| // A composition is committed via IME.
|
| {
|
| - string16 expected_title = UTF8ToUTF16("InputTest456");
|
| + base::string16 expected_title = UTF8ToUTF16("InputTest456");
|
| content::TitleWatcher title_watcher(test_guest()->web_contents(),
|
| expected_title);
|
| embedder_rvh->Send(
|
| @@ -984,7 +984,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, InputMethod) {
|
| {
|
| ExecuteSyncJSFunction(guest_rvh,
|
| "document.getElementById('input1').value = '';");
|
| - string16 composition = UTF8ToUTF16("InputTest789");
|
| + base::string16 composition = UTF8ToUTF16("InputTest789");
|
| content::TitleWatcher title_watcher(test_guest()->web_contents(),
|
| composition);
|
| embedder_rvh->Send(
|
| @@ -1016,7 +1016,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, InputMethod) {
|
| "i.value = 'InputTestABC';"
|
| "i.selectionStart=6;"
|
| "i.selectionEnd=6;");
|
| - string16 expected_value = UTF8ToUTF16("InputABC");
|
| + base::string16 expected_value = UTF8ToUTF16("InputABC");
|
| content::TitleWatcher title_watcher(test_guest()->web_contents(),
|
| expected_value);
|
| // Delete 'Test' in 'InputTestABC', as the caret is after 'T':
|
|
|