Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1824)

Unified Diff: chrome/test/base/tracing.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/plugins/plugin_uma.cc ('k') | chromecast/media/base/media_message_loop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/tracing.cc
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
index c3280ce147ee7ef2807eb771497c1bc345a21fae..83cbbcce575d319b5ffe4a882f798076541d3e0c 100644
--- a/chrome/test/base/tracing.cc
+++ b/chrome/test/base/tracing.cc
@@ -46,7 +46,7 @@ class StringTraceSink : public content::TracingController::TraceDataSink {
class InProcessTraceController {
public:
static InProcessTraceController* GetInstance() {
- return Singleton<InProcessTraceController>::get();
+ return base::Singleton<InProcessTraceController>::get();
}
InProcessTraceController()
@@ -126,7 +126,7 @@ class InProcessTraceController {
}
private:
- friend struct DefaultSingletonTraits<InProcessTraceController>;
+ friend struct base::DefaultSingletonTraits<InProcessTraceController>;
void OnEnableTracingComplete() {
message_loop_runner_->Quit();
« no previous file with comments | « chrome/renderer/plugins/plugin_uma.cc ('k') | chromecast/media/base/media_message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698