Update to Chromium revision 220934.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1427 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-09-03 21:48:12 +00:00
parent 9e50918a30
commit 97dd8beb4f
18 changed files with 59 additions and 49 deletions

View File

@@ -367,7 +367,7 @@ void LoadTraceFile(CefRefPtr<CefFrameHostImpl> frame,
return;
std::string file_contents;
if (!file_util::ReadFileToString(path, &file_contents)) {
if (!base::ReadFileToString(path, &file_contents)) {
frame->SendJavaScript(
"tracingController.onLoadTraceFileCanceled();", std::string(), 0);
return;