| Index: chrome/browser/history/multipart_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/history/multipart_uitest.cc (revision 73805)
|
| +++ chrome/browser/history/multipart_uitest.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include "app/sql/connection.h"
|
| #include "app/sql/statement.h"
|
| #include "base/file_util.h"
|
| +#include "base/utf_string_conversions.h"
|
| #include "chrome/test/automation/tab_proxy.h"
|
| #include "chrome/test/automation/browser_proxy.h"
|
| #include "net/test/test_server.h"
|
| @@ -32,9 +33,9 @@
|
| scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetActiveTab());
|
| ASSERT_TRUE(tab_proxy.get());
|
| NavigateToURL(test_server.GetURL("multipart"));
|
| - std::wstring title;
|
| + string16 title;
|
| EXPECT_TRUE(tab_proxy->GetTabTitle(&title));
|
| - EXPECT_EQ(L"page 9", title);
|
| + EXPECT_EQ(ASCIIToUTF16("page 9"), title);
|
| CloseBrowserAndServer();
|
|
|
| // The browser has shutdown now. Check the contents of the history
|
|
|