| Index: webkit/tools/test_shell/test_shell_win.cc
|
| diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
|
| index 5c1d7d8280c18608eb0d0c6e6c2724306afd11a3..e3de9320c39b2f90f0e72db5ce82c3137ba4b83a 100644
|
| --- a/webkit/tools/test_shell/test_shell_win.cc
|
| +++ b/webkit/tools/test_shell/test_shell_win.cc
|
| @@ -475,7 +475,7 @@ void TestShell::ResizeSubViews() {
|
| }
|
|
|
| void TestShell::LoadURLForFrame(const GURL& url,
|
| - const std::wstring& frame_name) {
|
| + const string16& frame_name) {
|
| if (!url.is_valid())
|
| return;
|
|
|
| @@ -490,7 +490,7 @@ void TestShell::LoadURLForFrame(const GURL& url,
|
| }
|
|
|
| navigation_controller_->LoadEntry(
|
| - new TestNavigationEntry(-1, url, std::wstring(), frame_name));
|
| + new TestNavigationEntry(-1, url, frame_name));
|
| }
|
|
|
| LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
|
|
|