Update to Chromium revision 47fb4821 (#318735).

- Remove the in-process PDF plugin implementation. A new implementation is now required (issue #1565).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2043 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2015-03-04 01:00:13 +00:00
parent a9191b26d2
commit ac4f451c94
42 changed files with 361 additions and 617 deletions

View File

@@ -6,8 +6,8 @@
#include "include/cef_trace.h"
#include "libcef/browser/thread_util.h"
#include "base/debug/trace_event.h"
#include "base/files/file_util.h"
#include "base/trace_event/trace_event.h"
#include "content/public/browser/tracing_controller.h"
namespace {
@@ -57,8 +57,8 @@ bool CefTraceSubscriber::BeginTracing(
}
TracingController::GetInstance()->EnableRecording(
base::debug::CategoryFilter(categories),
base::debug::TraceOptions(),
base::trace_event::CategoryFilter(categories),
base::trace_event::TraceOptions(),
done_callback);
return true;
}