Index: content/browser/accessibility/browser_accessibility_manager_unittest.cc |
diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc |
index fbbf3c4f9854b2f7ce2c520ad6cfea0dba434f3b..b0d4836398929cc3ca6f4e407a8ae83e945f81e8 100644 |
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc |
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc |
@@ -93,19 +93,19 @@ TEST(BrowserAccessibilityManagerTest, TestNoLeaks) { |
AccessibilityNodeData button; |
button.id = 2; |
button.SetName("Button"); |
- button.role = WebKit::WebAXRoleButton; |
+ button.role = blink::WebAXRoleButton; |
button.state = 0; |
AccessibilityNodeData checkbox; |
checkbox.id = 3; |
checkbox.SetName("Checkbox"); |
- checkbox.role = WebKit::WebAXRoleCheckBox; |
+ checkbox.role = blink::WebAXRoleCheckBox; |
checkbox.state = 0; |
AccessibilityNodeData root; |
root.id = 1; |
root.SetName("Document"); |
- root.role = WebKit::WebAXRoleRootWebArea; |
+ root.role = blink::WebAXRoleRootWebArea; |
root.state = 0; |
root.child_ids.push_back(2); |
root.child_ids.push_back(3); |
@@ -172,25 +172,25 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { |
AccessibilityNodeData tree1_child1; |
tree1_child1.id = 2; |
tree1_child1.SetName("Child1"); |
- tree1_child1.role = WebKit::WebAXRoleButton; |
+ tree1_child1.role = blink::WebAXRoleButton; |
tree1_child1.state = 0; |
AccessibilityNodeData tree1_child2; |
tree1_child2.id = 3; |
tree1_child2.SetName("Child2"); |
- tree1_child2.role = WebKit::WebAXRoleButton; |
+ tree1_child2.role = blink::WebAXRoleButton; |
tree1_child2.state = 0; |
AccessibilityNodeData tree1_child3; |
tree1_child3.id = 4; |
tree1_child3.SetName("Child3"); |
- tree1_child3.role = WebKit::WebAXRoleButton; |
+ tree1_child3.role = blink::WebAXRoleButton; |
tree1_child3.state = 0; |
AccessibilityNodeData tree1_root; |
tree1_root.id = 1; |
tree1_root.SetName("Document"); |
- tree1_root.role = WebKit::WebAXRoleRootWebArea; |
+ tree1_root.role = blink::WebAXRoleRootWebArea; |
tree1_root.state = 0; |
tree1_root.child_ids.push_back(2); |
tree1_root.child_ids.push_back(3); |
@@ -207,13 +207,13 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { |
AccessibilityNodeData tree2_child0; |
tree2_child0.id = 5; |
tree2_child0.SetName("Child0"); |
- tree2_child0.role = WebKit::WebAXRoleButton; |
+ tree2_child0.role = blink::WebAXRoleButton; |
tree2_child0.state = 0; |
AccessibilityNodeData tree2_root; |
tree2_root.id = 1; |
tree2_root.SetName("DocumentChanged"); |
- tree2_root.role = WebKit::WebAXRoleRootWebArea; |
+ tree2_root.role = blink::WebAXRoleRootWebArea; |
tree2_root.state = 0; |
tree2_root.child_ids.push_back(5); |
tree2_root.child_ids.push_back(2); |
@@ -255,7 +255,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { |
std::vector<AccessibilityHostMsg_EventParams> params; |
params.push_back(AccessibilityHostMsg_EventParams()); |
AccessibilityHostMsg_EventParams* msg = ¶ms[0]; |
- msg->event_type = WebKit::WebAXEventChildrenChanged; |
+ msg->event_type = blink::WebAXEventChildrenChanged; |
msg->nodes.push_back(tree2_root); |
msg->nodes.push_back(tree2_child0); |
msg->id = tree2_root.id; |
@@ -307,46 +307,46 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { |
AccessibilityNodeData tree1_grandchild1; |
tree1_grandchild1.id = 4; |
tree1_grandchild1.SetName("GrandChild1"); |
- tree1_grandchild1.role = WebKit::WebAXRoleButton; |
+ tree1_grandchild1.role = blink::WebAXRoleButton; |
tree1_grandchild1.state = 0; |
AccessibilityNodeData tree1_child1; |
tree1_child1.id = 3; |
tree1_child1.SetName("Child1"); |
- tree1_child1.role = WebKit::WebAXRoleButton; |
+ tree1_child1.role = blink::WebAXRoleButton; |
tree1_child1.state = 0; |
tree1_child1.child_ids.push_back(4); |
AccessibilityNodeData tree1_grandchild2; |
tree1_grandchild2.id = 6; |
tree1_grandchild2.SetName("GrandChild1"); |
- tree1_grandchild2.role = WebKit::WebAXRoleButton; |
+ tree1_grandchild2.role = blink::WebAXRoleButton; |
tree1_grandchild2.state = 0; |
AccessibilityNodeData tree1_child2; |
tree1_child2.id = 5; |
tree1_child2.SetName("Child2"); |
- tree1_child2.role = WebKit::WebAXRoleButton; |
+ tree1_child2.role = blink::WebAXRoleButton; |
tree1_child2.state = 0; |
tree1_child2.child_ids.push_back(6); |
AccessibilityNodeData tree1_grandchild3; |
tree1_grandchild3.id = 8; |
tree1_grandchild3.SetName("GrandChild3"); |
- tree1_grandchild3.role = WebKit::WebAXRoleButton; |
+ tree1_grandchild3.role = blink::WebAXRoleButton; |
tree1_grandchild3.state = 0; |
AccessibilityNodeData tree1_child3; |
tree1_child3.id = 7; |
tree1_child3.SetName("Child3"); |
- tree1_child3.role = WebKit::WebAXRoleButton; |
+ tree1_child3.role = blink::WebAXRoleButton; |
tree1_child3.state = 0; |
tree1_child3.child_ids.push_back(8); |
AccessibilityNodeData tree1_container; |
tree1_container.id = 2; |
tree1_container.SetName("Container"); |
- tree1_container.role = WebKit::WebAXRoleGroup; |
+ tree1_container.role = blink::WebAXRoleGroup; |
tree1_container.state = 0; |
tree1_container.child_ids.push_back(3); |
tree1_container.child_ids.push_back(5); |
@@ -355,7 +355,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { |
AccessibilityNodeData tree1_root; |
tree1_root.id = 1; |
tree1_root.SetName("Document"); |
- tree1_root.role = WebKit::WebAXRoleRootWebArea; |
+ tree1_root.role = blink::WebAXRoleRootWebArea; |
tree1_root.state = 0; |
tree1_root.child_ids.push_back(2); |
@@ -374,20 +374,20 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { |
AccessibilityNodeData tree2_grandchild0; |
tree2_grandchild0.id = 9; |
tree2_grandchild0.SetName("GrandChild0"); |
- tree2_grandchild0.role = WebKit::WebAXRoleButton; |
+ tree2_grandchild0.role = blink::WebAXRoleButton; |
tree2_grandchild0.state = 0; |
AccessibilityNodeData tree2_child0; |
tree2_child0.id = 10; |
tree2_child0.SetName("Child0"); |
- tree2_child0.role = WebKit::WebAXRoleButton; |
+ tree2_child0.role = blink::WebAXRoleButton; |
tree2_child0.state = 0; |
tree2_child0.child_ids.push_back(9); |
AccessibilityNodeData tree2_container; |
tree2_container.id = 2; |
tree2_container.SetName("Container"); |
- tree2_container.role = WebKit::WebAXRoleGroup; |
+ tree2_container.role = blink::WebAXRoleGroup; |
tree2_container.state = 0; |
tree2_container.child_ids.push_back(10); |
tree2_container.child_ids.push_back(3); |
@@ -432,7 +432,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { |
std::vector<AccessibilityHostMsg_EventParams> params; |
params.push_back(AccessibilityHostMsg_EventParams()); |
AccessibilityHostMsg_EventParams* msg = ¶ms[0]; |
- msg->event_type = WebKit::WebAXEventChildrenChanged; |
+ msg->event_type = blink::WebAXEventChildrenChanged; |
msg->nodes.push_back(tree2_container); |
msg->nodes.push_back(tree2_child0); |
msg->nodes.push_back(tree2_grandchild0); |
@@ -494,7 +494,7 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) { |
AccessibilityNodeData tree1_1; |
tree1_1.id = 1; |
- tree1_1.role = WebKit::WebAXRoleRootWebArea; |
+ tree1_1.role = blink::WebAXRoleRootWebArea; |
tree1_1.state = 0; |
tree1_1.child_ids.push_back(2); |
tree1_1.child_ids.push_back(3); |
@@ -539,7 +539,7 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) { |
std::vector<AccessibilityHostMsg_EventParams> params; |
params.push_back(AccessibilityHostMsg_EventParams()); |
AccessibilityHostMsg_EventParams* msg = ¶ms[0]; |
- msg->event_type = WebKit::WebAXEventChildrenChanged; |
+ msg->event_type = blink::WebAXEventChildrenChanged; |
msg->nodes.push_back(tree2_1); |
msg->nodes.push_back(tree2_4); |
msg->nodes.push_back(tree2_5); |
@@ -568,7 +568,7 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { |
AccessibilityNodeData root; |
root.id = 1; |
- root.role = WebKit::WebAXRoleRootWebArea; |
+ root.role = blink::WebAXRoleRootWebArea; |
root.child_ids.push_back(2); |
root.child_ids.push_back(2); |
@@ -586,7 +586,7 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { |
AccessibilityNodeData root2; |
root2.id = 1; |
- root2.role = WebKit::WebAXRoleRootWebArea; |
+ root2.role = blink::WebAXRoleRootWebArea; |
root2.child_ids.push_back(2); |
root2.child_ids.push_back(3); |
@@ -614,22 +614,22 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { |
TEST(BrowserAccessibilityManagerTest, BoundsForRange) { |
AccessibilityNodeData root; |
root.id = 1; |
- root.role = WebKit::WebAXRoleRootWebArea; |
+ root.role = blink::WebAXRoleRootWebArea; |
AccessibilityNodeData static_text; |
static_text.id = 2; |
static_text.SetValue("Hello, world."); |
- static_text.role = WebKit::WebAXRoleStaticText; |
+ static_text.role = blink::WebAXRoleStaticText; |
static_text.location = gfx::Rect(100, 100, 29, 18); |
root.child_ids.push_back(2); |
AccessibilityNodeData inline_text1; |
inline_text1.id = 3; |
inline_text1.SetValue("Hello, "); |
- inline_text1.role = WebKit::WebAXRoleInlineTextBox; |
+ inline_text1.role = blink::WebAXRoleInlineTextBox; |
inline_text1.location = gfx::Rect(100, 100, 29, 9); |
inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, |
- WebKit::WebAXTextDirectionLR); |
+ blink::WebAXTextDirectionLR); |
std::vector<int32> character_offsets1; |
character_offsets1.push_back(6); // 0 |
character_offsets1.push_back(11); // 1 |
@@ -645,10 +645,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) { |
AccessibilityNodeData inline_text2; |
inline_text2.id = 4; |
inline_text2.SetValue("world."); |
- inline_text2.role = WebKit::WebAXRoleInlineTextBox; |
+ inline_text2.role = blink::WebAXRoleInlineTextBox; |
inline_text2.location = gfx::Rect(100, 109, 28, 9); |
inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, |
- WebKit::WebAXTextDirectionLR); |
+ blink::WebAXTextDirectionLR); |
std::vector<int32> character_offsets2; |
character_offsets2.push_back(5); |
character_offsets2.push_back(10); |
@@ -705,22 +705,22 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) { |
AccessibilityNodeData root; |
root.id = 1; |
- root.role = WebKit::WebAXRoleRootWebArea; |
+ root.role = blink::WebAXRoleRootWebArea; |
AccessibilityNodeData static_text; |
static_text.id = 2; |
static_text.SetValue("123abc"); |
- static_text.role = WebKit::WebAXRoleStaticText; |
+ static_text.role = blink::WebAXRoleStaticText; |
static_text.location = gfx::Rect(100, 100, 60, 20); |
root.child_ids.push_back(2); |
AccessibilityNodeData inline_text1; |
inline_text1.id = 3; |
inline_text1.SetValue("123"); |
- inline_text1.role = WebKit::WebAXRoleInlineTextBox; |
+ inline_text1.role = blink::WebAXRoleInlineTextBox; |
inline_text1.location = gfx::Rect(100, 100, 30, 20); |
inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, |
- WebKit::WebAXTextDirectionLR); |
+ blink::WebAXTextDirectionLR); |
std::vector<int32> character_offsets1; |
character_offsets1.push_back(10); // 0 |
character_offsets1.push_back(20); // 1 |
@@ -732,10 +732,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) { |
AccessibilityNodeData inline_text2; |
inline_text2.id = 4; |
inline_text2.SetValue("abc"); |
- inline_text2.role = WebKit::WebAXRoleInlineTextBox; |
+ inline_text2.role = blink::WebAXRoleInlineTextBox; |
inline_text2.location = gfx::Rect(130, 100, 30, 20); |
inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, |
- WebKit::WebAXTextDirectionRL); |
+ blink::WebAXTextDirectionRL); |
std::vector<int32> character_offsets2; |
character_offsets2.push_back(10); |
character_offsets2.push_back(20); |