| Index: chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/browsing_data/browsing_data_remover_browsertest.cc (revision 174946)
|
| +++ chrome/browser/browsing_data/browsing_data_remover_browsertest.cc (working copy)
|
| @@ -43,14 +43,12 @@
|
| BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
|
| }
|
|
|
| - void RunScriptAndCheckResult(const std::string& script,
|
| + void RunScriptAndCheckResult(const std::wstring& script,
|
| const std::string& result) {
|
| std::string data;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| - chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - script,
|
| - &data));
|
| + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
|
| + script, &data));
|
| ASSERT_EQ(data, result);
|
| }
|
|
|
| @@ -103,16 +101,16 @@
|
| FilePath().AppendASCII("simple_database.html")));
|
| ui_test_utils::NavigateToURL(browser(), url);
|
|
|
| - RunScriptAndCheckResult("createTable()", "done");
|
| - RunScriptAndCheckResult("insertRecord('text')", "done");
|
| - RunScriptAndCheckResult("getRecords()", "text");
|
| + RunScriptAndCheckResult(L"createTable()", "done");
|
| + RunScriptAndCheckResult(L"insertRecord('text')", "done");
|
| + RunScriptAndCheckResult(L"getRecords()", "text");
|
|
|
| RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA);
|
|
|
| ui_test_utils::NavigateToURL(browser(), url);
|
| - RunScriptAndCheckResult("createTable()", "done");
|
| - RunScriptAndCheckResult("insertRecord('text2')", "done");
|
| - RunScriptAndCheckResult("getRecords()", "text2");
|
| + RunScriptAndCheckResult(L"createTable()", "done");
|
| + RunScriptAndCheckResult(L"insertRecord('text2')", "done");
|
| + RunScriptAndCheckResult(L"getRecords()", "text2");
|
| }
|
|
|
| // Profile::ClearNetworkingHistorySince should be exercised here too see whether
|
|
|