Move small c/b/extensions classes into extensions namespace no.1

chrome/browser/extensions/activity_log.cc

Index: chrome/browser/extensions/activity_log.cc
diff --git a/chrome/browser/extensions/extension_activity_log.cc b/chrome/browser/extensions/activity_log.cc
similarity index 60%
rename from chrome/browser/extensions/extension_activity_log.cc
rename to chrome/browser/extensions/activity_log.cc
index ea9a0486b5d55868c98b0c9f20cad21e745adaaa..937ee84e4a80ffd061947fb728d287f7da4d66d0 100644
--- a/chrome/browser/extensions/extension_activity_log.cc
+++ b/chrome/browser/extensions/activity_log.cc
@@ -2,29 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_activity_log.h"
+#include "chrome/browser/extensions/activity_log.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 
-ExtensionActivityLog::ExtensionActivityLog() {
+namespace extensions {
+
+ActivityLog::ActivityLog() {
   log_activity_to_stdout_ = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableExtensionActivityLogging);
 }
 
-ExtensionActivityLog::~ExtensionActivityLog() {
+ActivityLog::~ActivityLog() {
 }
 
 // static
-ExtensionActivityLog* ExtensionActivityLog::GetInstance() {
-  return Singleton<ExtensionActivityLog>::get();
+ActivityLog* ActivityLog::GetInstance() {
+  return Singleton<ActivityLog>::get();
 }
 
-void ExtensionActivityLog::AddObserver(
-    const extensions::Extension* extension,
-    ExtensionActivityLog::Observer* observer) {
+void ActivityLog::AddObserver(const Extension* extension,
+                              ActivityLog::Observer* observer) {
   base::AutoLock scoped_lock(lock_);
 
   if (observers_.count(extension) == 0) {
@@ -34,18 +35,17 @@ void ExtensionActivityLog::AddObserver(
   observers_[extension]->AddObserver(observer);
 }
 
-void ExtensionActivityLog::RemoveObserver(
-    const extensions::Extension* extension,
-    ExtensionActivityLog::Observer* observer) {
+void ActivityLog::RemoveObserver(const Extension* extension,
+                                 ActivityLog::Observer* observer) {
   base::AutoLock scoped_lock(lock_);
 
   if (observers_.count(extension) == 1) {
     observers_[extension]->RemoveObserver(observer);
   }
 }
+
 // Extension*
-bool ExtensionActivityLog::HasObservers(
-    const extensions::Extension* extension) const {
+bool ActivityLog::HasObservers(const Extension* extension) const {
   base::AutoLock scoped_lock(lock_);
 
   // We also return true if extension activity logging is enabled since in that
@@ -53,9 +53,9 @@ bool ExtensionActivityLog::HasObservers(
   return observers_.count(extension) > 0 || log_activity_to_stdout_;
 }
 
-void ExtensionActivityLog::Log(const extensions::Extension* extension,
-                               Activity activity,
-                               const std::string& msg) const {
+void ActivityLog::Log(const Extension* extension,
+                      Activity activity,
+                      const std::string& msg) const {
   base::AutoLock scoped_lock(lock_);
 
   ObserverMap::const_iterator iter = observers_.find(extension);
@@ -70,14 +70,16 @@ void ExtensionActivityLog::Log(const extensions::Extension* extension,
 }
 
 // static
-const char* ExtensionActivityLog::ActivityToString(Activity activity) {
+const char* ActivityLog::ActivityToString(Activity activity) {
   switch (activity) {
-    case ExtensionActivityLog::ACTIVITY_EXTENSION_API_CALL:
+    case ActivityLog::ACTIVITY_EXTENSION_API_CALL:
       return "api_call";
-    case ExtensionActivityLog::ACTIVITY_EXTENSION_API_BLOCK:
+    case ActivityLog::ACTIVITY_EXTENSION_API_BLOCK:
       return "api_block";
     default:
       NOTREACHED();
       return "";
   }
 }
+
+}  // namespace extensions