| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
|
| index df7ced9da5275178562be9e715bbc45ced242528..983f64e51fc4f5b65d924eda5791254cad74a89b 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate.cc
|
| @@ -332,7 +332,7 @@ void TestWebViewDelegate::spellCheck(const WebString& text,
|
| // Check the spelling of the given text.
|
| // TODO(hbono): rebaseline layout-test results of Windows and Linux so we
|
| // can enable this mock spellchecker on them.
|
| - string16 word(text);
|
| + base::string16 word(text);
|
| mock_spellcheck_.SpellCheckWord(word, &misspelledOffset, &misspelledLength);
|
| #endif
|
| }
|
| @@ -981,7 +981,7 @@ void TestWebViewDelegate::UpdateSessionHistory(WebFrame* frame) {
|
| entry->SetContentState(webkit_glue::HistoryItemToString(history_item));
|
| }
|
|
|
| -string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
|
| +base::string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
|
| std::string name = UTF16ToUTF8(webframe->uniqueName());
|
|
|
| if (webframe == shell_->webView()->mainFrame()) {
|
|
|