Revert 164120 - content/browser: Move more files into the content namespace.

content/browser/trace_controller_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_TRACE_CONTROLLER_IMPL_H_
 #define CONTENT_BROWSER_TRACE_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "content/public/browser/trace_controller.h"
 
 class CommandLine;
+class TraceMessageFilter;
 
 namespace content {
-class TraceMessageFilter;
 
 class TraceControllerImpl : public TraceController {
  public:
   static TraceControllerImpl* GetInstance();
 
   // Called on the main thread of the browser process to initialize
   // startup tracing.
   void InitStartupTracing(const CommandLine& command_line);
 
   // Get set of known categories. This can change as new code paths are reached.
@@ skipping 19 matching lines @@
   virtual bool SetWatchEvent(TraceSubscriber* subscriber,
                              const std::string& category_name,
                              const std::string& event_name) OVERRIDE;
   virtual bool CancelWatchEvent(TraceSubscriber* subscriber) OVERRIDE;
   virtual void CancelSubscriber(TraceSubscriber* subscriber) OVERRIDE;
 
  private:
   typedef std::set<scoped_refptr<TraceMessageFilter> > FilterMap;
 
   friend struct base::DefaultLazyInstanceTraits<TraceControllerImpl>;
-  friend class TraceMessageFilter;
+  friend class ::TraceMessageFilter;
 
   TraceControllerImpl();
   virtual ~TraceControllerImpl();
 
   bool is_tracing_enabled() const {
     return can_end_tracing();
   }
 
   bool can_end_tracing() const {
     return is_tracing_ && pending_end_ack_count_ == 0;
@@ skipping 37 matching lines @@
   std::string watch_category_;
   std::string watch_name_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceControllerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_TRACE_CONTROLLER_IMPL_H_