summaryrefslogtreecommitdiffstats
path: root/content/common/gpu
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-02-09 08:02:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 16:03:13 +0000
commitb2e3ececdfdc5ce1037d1bb648a7ff0f1d38f508 (patch)
tree098f6c0ae836aaed55cdf92b1a9ff5358779746a /content/common/gpu
parentfe2e3e76fe7842c9cdcf5c3aaa62081a564c42a2 (diff)
downloadchromium_src-b2e3ececdfdc5ce1037d1bb648a7ff0f1d38f508.zip
chromium_src-b2e3ececdfdc5ce1037d1bb648a7ff0f1d38f508.tar.gz
chromium_src-b2e3ececdfdc5ce1037d1bb648a7ff0f1d38f508.tar.bz2
Mechanical rename of base::debug -> base::trace_event for /content
This is the last stage of the trace_event directory restructuring. This is part of a set of 3 CLs which is moving tracing clients to use the new base::trace_event namespace. See crrev.com/837303004 and the related bug for motivations. BUG=451032 TBR=jam@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/892213004 Cr-Commit-Position: refs/heads/master@{#315310}
Diffstat (limited to 'content/common/gpu')
-rw-r--r--content/common/gpu/client/gl_helper_unittest.cc14
-rw-r--r--content/common/gpu/gpu_command_buffer_stub.cc8
2 files changed, 11 insertions, 11 deletions
diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc
index 85a300c..c28cc54 100644
--- a/content/common/gpu/client/gl_helper_unittest.cc
+++ b/content/common/gpu/client/gl_helper_unittest.cc
@@ -76,11 +76,11 @@ class GLHelperTest : public testing::Test {
}
void StartTracing(const std::string& filter) {
- base::debug::TraceLog::GetInstance()->SetEnabled(
- base::debug::CategoryFilter(filter),
- base::debug::TraceLog::RECORDING_MODE,
- base::debug::TraceOptions(
- base::debug::RECORD_UNTIL_FULL));
+ base::trace_event::TraceLog::GetInstance()->SetEnabled(
+ base::trace_event::CategoryFilter(filter),
+ base::trace_event::TraceLog::RECORDING_MODE,
+ base::trace_event::TraceOptions(
+ base::trace_event::RECORD_UNTIL_FULL));
}
static void TraceDataCB(
@@ -101,9 +101,9 @@ class GLHelperTest : public testing::Test {
// of event name->counts.
void EndTracing(std::map<std::string, int>* event_counts) {
std::string json_data = "[";
- base::debug::TraceLog::GetInstance()->SetDisabled();
+ base::trace_event::TraceLog::GetInstance()->SetDisabled();
base::RunLoop run_loop;
- base::debug::TraceLog::GetInstance()->Flush(
+ base::trace_event::TraceLog::GetInstance()->Flush(
base::Bind(&GLHelperTest::TraceDataCB,
run_loop.QuitClosure(),
base::Unretained(&json_data)));
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 4f1eeb3..62919d5 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -111,10 +111,10 @@ const int64 kHandleMoreWorkPeriodBusyMs = 1;
// Prevents idle work from being starved.
const int64 kMaxTimeSinceIdleMs = 10;
-class DevToolsChannelData : public base::debug::ConvertableToTraceFormat {
+class DevToolsChannelData : public base::trace_event::ConvertableToTraceFormat {
public:
- static scoped_refptr<base::debug::ConvertableToTraceFormat> CreateForChannel(
- GpuChannel* channel);
+ static scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+ CreateForChannel(GpuChannel* channel);
void AppendAsTraceFormat(std::string* out) const override {
std::string tmp;
@@ -129,7 +129,7 @@ class DevToolsChannelData : public base::debug::ConvertableToTraceFormat {
DISALLOW_COPY_AND_ASSIGN(DevToolsChannelData);
};
-scoped_refptr<base::debug::ConvertableToTraceFormat>
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
DevToolsChannelData::CreateForChannel(GpuChannel* channel) {
scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue);
res->SetInteger("renderer_pid", channel->renderer_pid());