Move content\accessibility code into the content namespace.

Review URL: https://codereview.chromium.org/11274020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163897 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 138 insertions, 62 deletions

diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 2b1cc70..59069a7 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -511,7 +511,7 @@ void SwizzleInit() {
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   if ([attribute isEqualToString:@"AXEnhancedUserInterface"] &&
       [value intValue] == 1) {
-    BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
+    content::BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
     for (TabContentsIterator it;
          !it.done();
          ++it) {
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index 1d0330a..ee3a0b7 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -264,7 +264,7 @@ void BrowserFrameWin::PostHandleMSG(UINT message,
 }
 
 void BrowserFrameWin::OnScreenReaderDetected() {
-  BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
+  content::BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
   NativeWidgetWin::OnScreenReaderDetected();
 }
 
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index e859b1a..4e8049c 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -320,7 +320,8 @@ void ToolbarView::Init(views::View* location_bar_parent,
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
-  if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
+  if (content::BrowserAccessibilityState::GetInstance()->
+          IsAccessibleBrowser()) {
     back_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
     forward_->SetTooltipText(
diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc
index 7441dcb..c87abb0 100644
--- a/content/browser/accessibility/browser_accessibility.cc
+++ b/content/browser/accessibility/browser_accessibility.cc
@@ -10,7 +10,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 typedef AccessibilityNodeData::BoolAttribute BoolAttribute;
 typedef AccessibilityNodeData::FloatAttribute FloatAttribute;
@@ -321,3 +321,5 @@ string16 BrowserAccessibility::GetTextRecursive() const {
 void BrowserAccessibility::PreInitialize() {
   instance_active_ = true;
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h
index c7a7a0f..07a79af 100644
--- a/content/browser/accessibility/browser_accessibility.h
+++ b/content/browser/accessibility/browser_accessibility.h
@@ -14,22 +14,22 @@
 #include "content/common/accessibility_node_data.h"
 #include "content/common/content_export.h"
 
-class BrowserAccessibilityManager;
 #if defined(OS_MACOSX) && __OBJC__
 @class BrowserAccessibilityCocoa;
-#elif defined(OS_WIN)
+#endif
+
+namespace content {
+class BrowserAccessibilityManager;
+#if defined(OS_WIN)
 class BrowserAccessibilityWin;
 #elif defined(TOOLKIT_GTK)
 class BrowserAccessibilityGtk;
 #endif
 
-typedef std::map<content::AccessibilityNodeData::BoolAttribute, bool>
-    BoolAttrMap;
-typedef std::map<content::AccessibilityNodeData::FloatAttribute, float>
-    FloatAttrMap;
-typedef std::map<content::AccessibilityNodeData::IntAttribute, int>
-    IntAttrMap;
-typedef std::map<content::AccessibilityNodeData::StringAttribute, string16>
+typedef std::map<AccessibilityNodeData::BoolAttribute, bool> BoolAttrMap;
+typedef std::map<AccessibilityNodeData::FloatAttribute, float> FloatAttrMap;
+typedef std::map<AccessibilityNodeData::IntAttribute, int> IntAttrMap;
+typedef std::map<AccessibilityNodeData::StringAttribute, string16>
     StringAttrMap;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@ class CONTENT_EXPORT BrowserAccessibility {
       BrowserAccessibility* parent,
       int32 child_id,
       int32 index_in_parent,
-      const content::AccessibilityNodeData& src);
+      const AccessibilityNodeData& src);
 
   // Add a child of this object.
   void AddChild(BrowserAccessibility* child);
@@ -206,23 +206,22 @@ class CONTENT_EXPORT BrowserAccessibility {
   // Retrieve the value of a bool attribute from the bool attribute
   // map and returns true if found.
   bool GetBoolAttribute(
-      content::AccessibilityNodeData::BoolAttribute attr, bool* value) const;
+      AccessibilityNodeData::BoolAttribute attr, bool* value) const;
 
   // Retrieve the value of a float attribute from the float attribute
   // map and returns true if found.
-  bool GetFloatAttribute(content::AccessibilityNodeData::FloatAttribute attr,
+  bool GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr,
                          float* value) const;
 
   // Retrieve the value of an integer attribute from the integer attribute
   // map and returns true if found.
-  bool GetIntAttribute(content::AccessibilityNodeData::IntAttribute attribute,
+  bool GetIntAttribute(AccessibilityNodeData::IntAttribute attribute,
                        int* value) const;
 
   // Retrieve the value of a string attribute from the attribute map and
   // returns true if found.
   bool GetStringAttribute(
-      content::AccessibilityNodeData::StringAttribute attribute,
-      string16* value) const;
+      AccessibilityNodeData::StringAttribute attribute, string16* value) const;
 
   // Retrieve the value of a html attribute from the attribute map and
   // returns true if found.
@@ -245,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibility {
                        bool* is_mixed) const;
 
   // Returns true if the bit corresponding to the given state enum is 1.
-  bool HasState(content::AccessibilityNodeData::State state_enum) const;
+  bool HasState(AccessibilityNodeData::State state_enum) const;
 
   // Returns true if this node is an editable text field of any kind.
   bool IsEditableText() const;
@@ -312,4 +311,6 @@ class CONTENT_EXPORT BrowserAccessibility {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
index e892946..db0753b 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.h
+++ b/content/browser/accessibility/browser_accessibility_cocoa.h
@@ -17,7 +17,7 @@
 // This class converts it into a format Cocoa can query.
 @interface BrowserAccessibilityCocoa : NSObject {
  @private
-  BrowserAccessibility* browserAccessibility_;
+  content::BrowserAccessibility* browserAccessibility_;
   scoped_nsobject<NSMutableArray> children_;
   id<BrowserAccessibilityDelegateCocoa> delegate_;
 }
@@ -26,7 +26,7 @@
 // the cross platform BrowserAccessibility object.  The delegate is
 // used to communicate with the host renderer.  None of these
 // parameters can be null.
-- (id)initWithObject:(BrowserAccessibility*)accessibility
+- (id)initWithObject:(content::BrowserAccessibility*)accessibility
             delegate:(id<BrowserAccessibilityDelegateCocoa>)delegate;
 
 // Invalidate children for a non-ignored ancestor (including self).
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 25e228c..ca9996d 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -23,6 +23,9 @@
 extern "C" void NSAccessibilityUnregisterUniqueIdForUIElement(id element);
 
 using content::AccessibilityNodeData;
+using content::BrowserAccessibility;
+using content::BrowserAccessibilityManager;
+using content::ContentClient;
 typedef AccessibilityNodeData::StringAttribute StringAttribute;
 
 namespace {
@@ -564,7 +567,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 - (NSString*)roleDescription {
   NSString* role = [self role];
 
-  content::ContentClient* content_client = content::GetContentClient();
+  ContentClient* content_client = content::GetContentClient();
 
   // The following descriptions are specific to webkit.
   if ([role isEqualToString:@"AXWebArea"]) {
diff --git a/content/browser/accessibility/browser_accessibility_gtk.cc b/content/browser/accessibility/browser_accessibility_gtk.cc
index 89a1477..fb6d99d 100644
--- a/content/browser/accessibility/browser_accessibility_gtk.cc
+++ b/content/browser/accessibility/browser_accessibility_gtk.cc
@@ -10,7 +10,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 // The maximum length of an autogenerated unique type name string,
 // generated from the 16-bit interface mask from an AtkObject.
@@ -365,3 +365,5 @@ void BrowserAccessibilityGtk::InitRoleAndState() {
       break;
   }
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_gtk.h b/content/browser/accessibility/browser_accessibility_gtk.h
index e2ac5ad..ba28b12 100644
--- a/content/browser/accessibility/browser_accessibility_gtk.h
+++ b/content/browser/accessibility/browser_accessibility_gtk.h
@@ -10,6 +10,8 @@
 #include "base/compiler_specific.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 
+namespace content {
+
 class BrowserAccessibilityGtk;
 class BrowserAccessibilityManagerGtk;
 
@@ -88,4 +90,6 @@ class BrowserAccessibilityGtk : public BrowserAccessibility {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityGtk);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_GTK_H_
diff --git a/content/browser/accessibility/browser_accessibility_mac.h b/content/browser/accessibility/browser_accessibility_mac.h
index b535fd7..10d2add 100644
--- a/content/browser/accessibility/browser_accessibility_mac.h
+++ b/content/browser/accessibility/browser_accessibility_mac.h
@@ -14,6 +14,8 @@
 
 @class BrowserAccessibilityCocoa;
 
+namespace content {
+
 class BrowserAccessibilityMac : public BrowserAccessibility {
  public:
   // Implementation of BrowserAccessibility.
@@ -43,4 +45,6 @@ class BrowserAccessibilityMac : public BrowserAccessibility {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityMac);
 };
 
+}  // namespace content
+
 #endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_
diff --git a/content/browser/accessibility/browser_accessibility_mac.mm b/content/browser/accessibility/browser_accessibility_mac.mm
index af489f4..7cb9d05 100644
--- a/content/browser/accessibility/browser_accessibility_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_mac.mm
@@ -10,6 +10,7 @@
 #import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
+namespace content {
 
 // Static.
 BrowserAccessibility* BrowserAccessibility::Create() {
@@ -61,3 +62,5 @@ BrowserAccessibilityCocoa* BrowserAccessibility::ToBrowserAccessibilityCocoa() {
   return static_cast<BrowserAccessibilityMac*>(this)->
       native_view();
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
index 91e1bd9..7d1572f 100644
--- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm
+++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
@@ -13,8 +13,6 @@
 #import "testing/gtest_mac.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
-using content::AccessibilityNodeData;
-
 @interface MockAccessibilityDelegate :
     NSView<BrowserAccessibilityDelegateCocoa>
 
@@ -53,6 +51,7 @@ using content::AccessibilityNodeData;
 
 @end
 
+namespace content {
 
 class BrowserAccessibilityTest : public ui::CocoaTest {
  public:
@@ -134,3 +133,5 @@ TEST_F(BrowserAccessibilityTest, InvalidAttributeTest) {
       accessibilityAttributeValue:@"NSAnInvalidAttribute"];
   EXPECT_TRUE(shouldBeNil == nil);
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index c20474f..b604fa6 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -9,7 +9,7 @@
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
   return BrowserAccessibility::Create();
@@ -400,3 +400,5 @@ BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
 
   return instance;
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h
index 1694c7d..7a0cdb6 100644
--- a/content/browser/accessibility/browser_accessibility_manager.h
+++ b/content/browser/accessibility/browser_accessibility_manager.h
@@ -14,13 +14,14 @@
 #include "content/common/content_export.h"
 #include "ui/gfx/native_widget_types.h"
 
+struct AccessibilityHostMsg_NotificationParams;
+
+namespace content {
 class BrowserAccessibility;
 #if defined(OS_WIN)
 class BrowserAccessibilityManagerWin;
 #endif
 
-struct AccessibilityHostMsg_NotificationParams;
-
 // Class that can perform actions on behalf of the BrowserAccessibilityManager.
 class CONTENT_EXPORT BrowserAccessibilityDelegate {
  public:
@@ -54,7 +55,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   // to the caller.
   static BrowserAccessibilityManager* Create(
     gfx::NativeView parent_view,
-    const content::AccessibilityNodeData& src,
+    const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
@@ -62,7 +63,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   // to the caller.
   static BrowserAccessibilityManager* CreateEmptyDocument(
     gfx::NativeView parent_view,
-    content::AccessibilityNodeData::State state,
+    AccessibilityNodeData::State state,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
@@ -156,7 +157,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
  protected:
   BrowserAccessibilityManager(
       gfx::NativeView parent_view,
-      const content::AccessibilityNodeData& src,
+      const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
@@ -187,14 +188,13 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   // received from the renderer process. When |include_children| is true
   // the node's children will also be updated, otherwise only the node
   // itself is updated.
-  void UpdateNode(const content::AccessibilityNodeData& src,
-                  bool include_children);
+  void UpdateNode(const AccessibilityNodeData& src, bool include_children);
 
   // Recursively build a tree of BrowserAccessibility objects from
   // the AccessibilityNodeData tree received from the renderer process.
   BrowserAccessibility* CreateAccessibilityTree(
       BrowserAccessibility* parent,
-      const content::AccessibilityNodeData& src,
+      const AccessibilityNodeData& src,
       int index_in_parent,
       bool send_show_events);
 
@@ -229,4 +229,6 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
diff --git a/content/browser/accessibility/browser_accessibility_manager_gtk.cc b/content/browser/accessibility/browser_accessibility_manager_gtk.cc
index a5f23b6..6613121 100644
--- a/content/browser/accessibility/browser_accessibility_manager_gtk.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_gtk.cc
@@ -7,7 +7,7 @@
 #include "content/browser/accessibility/browser_accessibility_gtk.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
@@ -69,3 +69,5 @@ void BrowserAccessibilityManagerGtk::RecursivelySendChildrenChanged(
     RecursivelySendChildrenChanged(child);
   }
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager_gtk.h b/content/browser/accessibility/browser_accessibility_manager_gtk.h
index f6b4067..bb736f7 100644
--- a/content/browser/accessibility/browser_accessibility_manager_gtk.h
+++ b/content/browser/accessibility/browser_accessibility_manager_gtk.h
@@ -7,9 +7,11 @@
 
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
-class BrowserAccessibilityGtk;
 struct ViewHostMsg_AccessibilityNotification_Params;
 
+namespace content {
+class BrowserAccessibilityGtk;
+
 // Manages a tree of BrowserAccessibilityGtk objects.
 class BrowserAccessibilityManagerGtk : public BrowserAccessibilityManager {
  public:
@@ -22,7 +24,7 @@ class BrowserAccessibilityManagerGtk : public BrowserAccessibilityManager {
  private:
   BrowserAccessibilityManagerGtk(
       GtkWidget* parent_window,
-      const content::AccessibilityNodeData& src,
+      const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
@@ -34,4 +36,6 @@ class BrowserAccessibilityManagerGtk : public BrowserAccessibilityManager {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerGtk);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_GTK_H_
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.h b/content/browser/accessibility/browser_accessibility_manager_mac.h
index 5641304..01553f8 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.h
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.h
@@ -9,6 +9,8 @@
 
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
+namespace content {
+
 class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager {
  public:
   // Implementation of BrowserAccessibilityManager.
@@ -21,11 +23,13 @@ class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager {
   friend class BrowserAccessibilityManager;
 
   BrowserAccessibilityManagerMac(gfx::NativeView parent_view,
-                                 const content::AccessibilityNodeData& src,
+                                 const AccessibilityNodeData& src,
                                  BrowserAccessibilityDelegate* delegate,
                                  BrowserAccessibilityFactory* factory);
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerMac);
 };
 
+}
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index a84b04a..2a4b254 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -8,7 +8,7 @@
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
@@ -107,3 +107,5 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent(
   DCHECK(native_node);
   NSAccessibilityPostNotification(native_node, event_id);
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
index 371bfdf..1617bdd 100644
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -10,8 +10,7 @@
 #include "content/common/accessibility_node_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::AccessibilityNodeData;
-
+namespace content {
 namespace {
 
 // Subclass of BrowserAccessibility that counts the number of instances.
@@ -635,3 +634,5 @@ TEST(BrowserAccessibilityManagerTest, TestCreateEmptyDocument) {
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc
index e8d7023..18ae1a9 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -7,7 +7,7 @@
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_messages.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
@@ -146,3 +146,5 @@ void BrowserAccessibilityManagerWin::TrackScrollingObject(
   tracked_scroll_object_ = node;
   tracked_scroll_object_->AddRef();
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.h b/content/browser/accessibility/browser_accessibility_manager_win.h
index 8af6684..9acaf71 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.h
+++ b/content/browser/accessibility/browser_accessibility_manager_win.h
@@ -10,6 +10,7 @@
 #include "base/win/scoped_comptr.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
+namespace content {
 class BrowserAccessibilityWin;
 
 // Manages a tree of BrowserAccessibilityWin objects.
@@ -32,7 +33,7 @@ class BrowserAccessibilityManagerWin : public BrowserAccessibilityManager {
  private:
   BrowserAccessibilityManagerWin(
       HWND parent_window,
-      const content::AccessibilityNodeData& src,
+      const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
@@ -50,4 +51,6 @@ class BrowserAccessibilityManagerWin : public BrowserAccessibilityManager {
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerWin);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.cc b/content/browser/accessibility/browser_accessibility_state_impl.cc
index df7dff9..8e7fde1 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.cc
+++ b/content/browser/accessibility/browser_accessibility_state_impl.cc
@@ -15,6 +15,8 @@
 #include "base/win/windows_version.h"
 #endif
 
+namespace content {
+
 // Update the accessibility histogram 45 seconds after initialization.
 static const int kAccessibilityHistogramDelaySecs = 45;
 
@@ -52,8 +54,8 @@ BrowserAccessibilityStateImpl::BrowserAccessibilityStateImpl()
   // And we need to AddRef() the leaky singleton so that Bind doesn't
   // delete it prematurely.
   AddRef();
-  content::BrowserThread::PostDelayedTask(
-      content::BrowserThread::FILE, FROM_HERE,
+  BrowserThread::PostDelayedTask(
+      BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowserAccessibilityStateImpl::UpdateHistogram, this),
       base::TimeDelta::FromSeconds(kAccessibilityHistogramDelaySecs));
 }
@@ -102,3 +104,5 @@ void BrowserAccessibilityStateImpl::SetAccessibilityMode(
     AccessibilityMode mode) {
   accessibility_mode_ = mode;
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.h b/content/browser/accessibility/browser_accessibility_state_impl.h
index 2c53bc3..fd2bd39 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.h
+++ b/content/browser/accessibility/browser_accessibility_state_impl.h
@@ -11,6 +11,8 @@
 #include "content/common/view_message_enums.h"
 #include "content/public/browser/browser_accessibility_state.h"
 
+namespace content {
+
 // The BrowserAccessibilityState class is used to determine if Chrome should be
 // customized for users with assistive technology, such as screen readers. We
 // modify the behavior of certain user interfaces to provide a better experience
@@ -61,4 +63,6 @@ class CONTENT_EXPORT BrowserAccessibilityStateImpl
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityStateImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_IMPL_H_
diff --git a/content/browser/accessibility/browser_accessibility_state_impl_win.cc b/content/browser/accessibility/browser_accessibility_state_impl_win.cc
index 7ba3793..d17a396 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl_win.cc
+++ b/content/browser/accessibility/browser_accessibility_state_impl_win.cc
@@ -11,6 +11,8 @@
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 
+namespace content {
+
 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
   AUDIODESCRIPTION audio_description = {0};
   audio_description.cbSize = sizeof(AUDIODESCRIPTION);
@@ -67,3 +69,5 @@ void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
   UMA_HISTOGRAM_BOOLEAN("Accessibility.WinSAToGo", satogo);
   UMA_HISTOGRAM_BOOLEAN("Accessibility.WinZoomText", zoomtext);
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 917e68c..5696ce2 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -18,7 +18,7 @@
 #include "ui/base/accessibility/accessible_text_utils.h"
 #include "ui/base/win/accessibility_misc_utils.h"
 
-using content::AccessibilityNodeData;
+namespace content {
 
 // The GUID for the ISimpleDOM service is not defined in the IDL files.
 // This is taken directly from the Mozilla sources
@@ -3520,3 +3520,5 @@ void BrowserAccessibilityWin::InitRoleAndState() {
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/browser_accessibility_win.h b/content/browser/accessibility/browser_accessibility_win.h
index c4385d0..d570f58 100644
--- a/content/browser/accessibility/browser_accessibility_win.h
+++ b/content/browser/accessibility/browser_accessibility_win.h
@@ -20,13 +20,14 @@
 #include "third_party/isimpledom/ISimpleDOMNode.h"
 #include "third_party/isimpledom/ISimpleDOMText.h"
 
-class BrowserAccessibilityRelation;
-
 namespace ui {
 enum TextBoundaryDirection;
 enum TextBoundaryType;
 }
 
+namespace content {
+class BrowserAccessibilityRelation;
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowserAccessibilityWin
@@ -777,26 +778,22 @@ BrowserAccessibilityWin
   // if found and nonempty, allocate a new BSTR (with SysAllocString)
   // and return S_OK. If not found or empty, return S_FALSE.
   HRESULT GetStringAttributeAsBstr(
-      content::AccessibilityNodeData::StringAttribute attribute,
-      BSTR* value_bstr);
+      AccessibilityNodeData::StringAttribute attribute, BSTR* value_bstr);
 
   // If the string attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void StringAttributeToIA2(
-      content::AccessibilityNodeData::StringAttribute attribute,
-      const char* ia2_attr);
+      AccessibilityNodeData::StringAttribute attribute, const char* ia2_attr);
 
   // If the bool attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void BoolAttributeToIA2(
-      content::AccessibilityNodeData::BoolAttribute attribute,
-      const char* ia2_attr);
+      AccessibilityNodeData::BoolAttribute attribute, const char* ia2_attr);
 
   // If the int attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void IntAttributeToIA2(
-      content::AccessibilityNodeData::IntAttribute attribute,
-      const char* ia2_attr);
+      AccessibilityNodeData::IntAttribute attribute, const char* ia2_attr);
 
   // Get the text of this node for the purposes of IAccessibleText - it may
   // be the name, it may be the value, etc. depending on the role.
@@ -868,4 +865,6 @@ BrowserAccessibilityWin
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc
index 8f67a3d..55aff43 100644
--- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
@@ -10,8 +10,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/win/atl_module.h"
 
-using content::AccessibilityNodeData;
-
+namespace content {
 namespace {
 
 // Subclass of BrowserAccessibilityWin that counts the number of instances.
@@ -535,3 +534,5 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/dump_accessibility_tree_helper.cc b/content/browser/accessibility/dump_accessibility_tree_helper.cc
index 187b0fa..e8a28f9 100644
--- a/content/browser/accessibility/dump_accessibility_tree_helper.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_helper.cc
@@ -8,6 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 
+namespace content {
 namespace {
 const int kIndentSpaces = 4;
 const char* kSkipString = "@NO_DUMP";
@@ -80,3 +81,5 @@ void DumpAccessibilityTreeHelper::Add(
 string16 DumpAccessibilityTreeHelper::FinishLine() {
   return line_;
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/dump_accessibility_tree_helper.h b/content/browser/accessibility/dump_accessibility_tree_helper.h
index 0a63872..42e04fa 100644
--- a/content/browser/accessibility/dump_accessibility_tree_helper.h
+++ b/content/browser/accessibility/dump_accessibility_tree_helper.h
@@ -12,6 +12,8 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 
+namespace content {
+
 // A utility class for retrieving platform specific accessibility information.
 // This is extended by a subclass for each platform where accessibility is
 // implemented.
@@ -75,4 +77,6 @@ class DumpAccessibilityTreeHelper {
   DISALLOW_COPY_AND_ASSIGN(DumpAccessibilityTreeHelper);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_
diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm
index 8c4549b..b7f8f51 100644
--- a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm
+++ b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm
@@ -11,6 +11,7 @@
 #include "content/browser/accessibility/browser_accessibility_cocoa.h"
 #include "content/browser/accessibility/browser_accessibility_mac.h"
 
+namespace content {
 namespace {
 string16 Format(BrowserAccessibility* node,
                 const char *prefix,
@@ -59,3 +60,5 @@ const std::string DumpAccessibilityTreeHelper::GetAllowString() const {
 const std::string DumpAccessibilityTreeHelper::GetDenyString() const {
   return "@MAC-DENY:";
 }
+
+}  // namespace content
diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc
index df9ec76..3094b39 100644
--- a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc
@@ -18,6 +18,7 @@
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/win/atl_module.h"
 
+namespace content {
 
 void DumpAccessibilityTreeHelper::Initialize() {
   ui::win::CreateATLModuleIfNeeded();
@@ -44,10 +45,10 @@ string16 DumpAccessibilityTreeHelper::ToString(
 
   // Get the description, help, and attributes.
   string16 description;
-  acc_obj->GetStringAttribute(content::AccessibilityNodeData::ATTR_DESCRIPTION,
+  acc_obj->GetStringAttribute(AccessibilityNodeData::ATTR_DESCRIPTION,
                               &description);
   string16 help;
-  acc_obj->GetStringAttribute(content::AccessibilityNodeData::ATTR_HELP, &help);
+  acc_obj->GetStringAttribute(AccessibilityNodeData::ATTR_HELP, &help);
   const std::vector<string16>& ia2_attributes = acc_obj->ia2_attributes();
 
   // Build the line.
@@ -88,3 +89,5 @@ const std::string DumpAccessibilityTreeHelper::GetAllowString() const {
 const std::string DumpAccessibilityTreeHelper::GetDenyString() const {
   return "@WIN-DENY:";
 }
+
+}  // namespace content
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 57c67ec..f6cdfd4 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -57,6 +57,8 @@
 #include "webkit/plugins/npapi/webplugin.h"
 
 using content::BackingStoreMac;
+using content::BrowserAccessibility;
+using content::BrowserAccessibilityManager;
 using content::EditCommand;
 using content::NativeWebKeyboardEvent;
 using content::RenderViewHostImpl;
diff --git a/content/public/browser/browser_accessibility_state.h b/content/public/browser/browser_accessibility_state.h
index 6893dce..fdf4d6c 100644
--- a/content/public/browser/browser_accessibility_state.h
+++ b/content/public/browser/browser_accessibility_state.h
@@ -7,6 +7,8 @@
 
 #include "content/common/content_export.h"
 
+namespace content {
+
 // The BrowserAccessibilityState class is used to determine if the browser
 // should be customized for users with assistive technology, such as screen
 // readers.
@@ -27,4 +29,6 @@ class CONTENT_EXPORT BrowserAccessibilityState {
   virtual bool IsAccessibleBrowser() = 0;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_ACCESSIBILITY_STATE_H_
diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h
index 709e33a..6d348f7 100644
--- a/content/public/browser/render_widget_host_view.h
+++ b/content/public/browser/render_widget_host_view.h
@@ -17,7 +17,6 @@
 #include <gdk/gdk.h>
 #endif
 
-class BrowserAccessibilityManager;
 class GURL;
 
 namespace gfx {
@@ -27,6 +26,7 @@ class Size;
 
 namespace content {
 
+class BrowserAccessibilityManager;
 class RenderWidgetHost;
 
 // RenderWidgetHostView is an interface implemented by an object that acts as