2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index 1536f24..ff1868a 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -257,7 +257,7 @@ ProtocolCommand::~ProtocolCommand() {
 
 // static
 DevToolsAndroidBridge::Factory* DevToolsAndroidBridge::Factory::GetInstance() {
-  return Singleton<DevToolsAndroidBridge::Factory>::get();
+  return base::Singleton<DevToolsAndroidBridge::Factory>::get();
 }
 
 // static
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h
index b112ff9..3b989a3 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.h
+++ b/chrome/browser/devtools/device/devtools_android_bridge.h
@@ -20,14 +20,14 @@
 #include "content/public/browser/devtools_agent_host.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace base {
 template<typename T> struct DefaultSingletonTraits;
 
-namespace base {
 class MessageLoop;
 class DictionaryValue;
 class ListValue;
 class Thread;
-}
+}  // namespace base
 
 namespace content {
 class BrowserContext;
@@ -51,7 +51,7 @@ class DevToolsAndroidBridge : public KeyedService {
     static DevToolsAndroidBridge* GetForProfile(Profile* profile);
 
    private:
-    friend struct DefaultSingletonTraits<Factory>;
+    friend struct base::DefaultSingletonTraits<Factory>;
 
     Factory();
     ~Factory() override;