| Index: content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| index 4c1ceebbf9ab3b68dcff67a54e6f2c142d17acda..edb572f014c47adf08c485a80c7d4b59d5b3e2f1 100644
|
| --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| @@ -115,19 +115,19 @@ TEST_F(BrowserAccessibilityTest, 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);
|
| @@ -183,14 +183,14 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
|
| // BrowserAccessibilityManager.
|
| AccessibilityNodeData text;
|
| text.id = 2;
|
| - text.role = WebKit::WebAXRoleStaticText;
|
| + text.role = blink::WebAXRoleStaticText;
|
| text.SetName("old text");
|
| text.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);
|
|
|
| @@ -228,11 +228,11 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
|
| // Notify the BrowserAccessibilityManager that the text child has changed.
|
| AccessibilityNodeData text2;
|
| text2.id = 2;
|
| - text2.role = WebKit::WebAXRoleStaticText;
|
| + text2.role = blink::WebAXRoleStaticText;
|
| text2.SetName("new text");
|
| text2.SetName("old text");
|
| AccessibilityHostMsg_EventParams param;
|
| - param.event_type = WebKit::WebAXEventChildrenChanged;
|
| + param.event_type = blink::WebAXEventChildrenChanged;
|
| param.nodes.push_back(text2);
|
| param.id = text2.id;
|
| std::vector<AccessibilityHostMsg_EventParams> events;
|
| @@ -267,17 +267,17 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
|
| // BrowserAccessibilityManager.
|
| AccessibilityNodeData div;
|
| div.id = 2;
|
| - div.role = WebKit::WebAXRoleGroup;
|
| + div.role = blink::WebAXRoleGroup;
|
| div.state = 0;
|
|
|
| AccessibilityNodeData text3;
|
| text3.id = 3;
|
| - text3.role = WebKit::WebAXRoleStaticText;
|
| + text3.role = blink::WebAXRoleStaticText;
|
| text3.state = 0;
|
|
|
| AccessibilityNodeData text4;
|
| text4.id = 4;
|
| - text4.role = WebKit::WebAXRoleStaticText;
|
| + text4.role = blink::WebAXRoleStaticText;
|
| text4.state = 0;
|
|
|
| div.child_ids.push_back(3);
|
| @@ -285,7 +285,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
|
|
|
| AccessibilityNodeData root;
|
| root.id = 1;
|
| - root.role = WebKit::WebAXRoleRootWebArea;
|
| + root.role = blink::WebAXRoleRootWebArea;
|
| root.state = 0;
|
| root.child_ids.push_back(2);
|
|
|
| @@ -304,7 +304,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
|
| // were removed and ensure that only one BrowserAccessibility instance exists.
|
| root.child_ids.clear();
|
| AccessibilityHostMsg_EventParams param;
|
| - param.event_type = WebKit::WebAXEventChildrenChanged;
|
| + param.event_type = blink::WebAXEventChildrenChanged;
|
| param.nodes.push_back(root);
|
| param.id = root.id;
|
| std::vector<AccessibilityHostMsg_EventParams> events;
|
| @@ -323,7 +323,7 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
|
|
| AccessibilityNodeData text1;
|
| text1.id = 11;
|
| - text1.role = WebKit::WebAXRoleTextField;
|
| + text1.role = blink::WebAXRoleTextField;
|
| text1.state = 0;
|
| text1.AddStringAttribute(AccessibilityNodeData::ATTR_VALUE, text1_value);
|
| std::vector<int32> line_breaks;
|
| @@ -333,7 +333,7 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
|
|
| AccessibilityNodeData root;
|
| root.id = 1;
|
| - root.role = WebKit::WebAXRoleRootWebArea;
|
| + root.role = blink::WebAXRoleRootWebArea;
|
| root.state = 0;
|
| root.child_ids.push_back(11);
|
|
|
| @@ -420,20 +420,20 @@ TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) {
|
|
|
| AccessibilityNodeData text1;
|
| text1.id = 11;
|
| - text1.role = WebKit::WebAXRoleStaticText;
|
| - text1.state = 1 << WebKit::WebAXStateReadonly;
|
| + text1.role = blink::WebAXRoleStaticText;
|
| + text1.state = 1 << blink::WebAXStateReadonly;
|
| text1.SetName(text1_name);
|
|
|
| AccessibilityNodeData text2;
|
| text2.id = 12;
|
| - text2.role = WebKit::WebAXRoleStaticText;
|
| - text2.state = 1 << WebKit::WebAXStateReadonly;
|
| + text2.role = blink::WebAXRoleStaticText;
|
| + text2.state = 1 << blink::WebAXStateReadonly;
|
| text2.SetName(text2_name);
|
|
|
| AccessibilityNodeData root;
|
| root.id = 1;
|
| - root.role = WebKit::WebAXRoleRootWebArea;
|
| - root.state = 1 << WebKit::WebAXStateReadonly;
|
| + root.role = blink::WebAXRoleRootWebArea;
|
| + root.state = 1 << blink::WebAXStateReadonly;
|
| root.child_ids.push_back(11);
|
| root.child_ids.push_back(12);
|
|
|
| @@ -488,40 +488,40 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
|
|
|
| AccessibilityNodeData text1;
|
| text1.id = 11;
|
| - text1.role = WebKit::WebAXRoleStaticText;
|
| - text1.state = 1 << WebKit::WebAXStateReadonly;
|
| + text1.role = blink::WebAXRoleStaticText;
|
| + text1.state = 1 << blink::WebAXStateReadonly;
|
| text1.SetName(text1_name);
|
|
|
| AccessibilityNodeData text2;
|
| text2.id = 12;
|
| - text2.role = WebKit::WebAXRoleStaticText;
|
| - text2.state = 1 << WebKit::WebAXStateReadonly;
|
| + text2.role = blink::WebAXRoleStaticText;
|
| + text2.state = 1 << blink::WebAXStateReadonly;
|
| text2.SetName(text2_name);
|
|
|
| AccessibilityNodeData button1, button1_text;
|
| button1.id = 13;
|
| button1_text.id = 15;
|
| button1_text.SetName(button1_text_name);
|
| - button1.role = WebKit::WebAXRoleButton;
|
| - button1_text.role = WebKit::WebAXRoleStaticText;
|
| - button1.state = 1 << WebKit::WebAXStateReadonly;
|
| - button1_text.state = 1 << WebKit::WebAXStateReadonly;
|
| + button1.role = blink::WebAXRoleButton;
|
| + button1_text.role = blink::WebAXRoleStaticText;
|
| + button1.state = 1 << blink::WebAXStateReadonly;
|
| + button1_text.state = 1 << blink::WebAXStateReadonly;
|
| button1.child_ids.push_back(15);
|
|
|
| AccessibilityNodeData link1, link1_text;
|
| link1.id = 14;
|
| link1_text.id = 16;
|
| link1_text.SetName(link1_text_name);
|
| - link1.role = WebKit::WebAXRoleLink;
|
| - link1_text.role = WebKit::WebAXRoleStaticText;
|
| - link1.state = 1 << WebKit::WebAXStateReadonly;
|
| - link1_text.state = 1 << WebKit::WebAXStateReadonly;
|
| + link1.role = blink::WebAXRoleLink;
|
| + link1_text.role = blink::WebAXRoleStaticText;
|
| + link1.state = 1 << blink::WebAXStateReadonly;
|
| + link1_text.state = 1 << blink::WebAXStateReadonly;
|
| link1.child_ids.push_back(16);
|
|
|
| AccessibilityNodeData root;
|
| root.id = 1;
|
| - root.role = WebKit::WebAXRoleRootWebArea;
|
| - root.state = 1 << WebKit::WebAXStateReadonly;
|
| + root.role = blink::WebAXRoleRootWebArea;
|
| + root.state = 1 << blink::WebAXStateReadonly;
|
| root.child_ids.push_back(11);
|
| root.child_ids.push_back(13);
|
| root.child_ids.push_back(12);
|
| @@ -601,9 +601,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
|
| // Try creating an empty document with busy state. Readonly is
|
| // set automatically.
|
| CountedBrowserAccessibility::reset();
|
| - const int32 busy_state = 1 << WebKit::WebAXStateBusy;
|
| - const int32 readonly_state = 1 << WebKit::WebAXStateReadonly;
|
| - const int32 enabled_state = 1 << WebKit::WebAXStateEnabled;
|
| + const int32 busy_state = 1 << blink::WebAXStateBusy;
|
| + const int32 readonly_state = 1 << blink::WebAXStateReadonly;
|
| + const int32 enabled_state = 1 << blink::WebAXStateEnabled;
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| new BrowserAccessibilityManagerWin(
|
| GetDesktopWindow(),
|
| @@ -615,24 +615,24 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
|
| // Verify the root is as we expect by default.
|
| BrowserAccessibility* root = manager->GetRoot();
|
| EXPECT_EQ(0, root->renderer_id());
|
| - EXPECT_EQ(WebKit::WebAXRoleRootWebArea, root->role());
|
| + EXPECT_EQ(blink::WebAXRoleRootWebArea, root->role());
|
| EXPECT_EQ(busy_state | readonly_state | enabled_state, root->state());
|
|
|
| // Tree with a child textfield.
|
| AccessibilityNodeData tree1_1;
|
| tree1_1.id = 1;
|
| - tree1_1.role = WebKit::WebAXRoleRootWebArea;
|
| + tree1_1.role = blink::WebAXRoleRootWebArea;
|
| tree1_1.child_ids.push_back(2);
|
|
|
| AccessibilityNodeData tree1_2;
|
| tree1_2.id = 2;
|
| - tree1_2.role = WebKit::WebAXRoleTextField;
|
| + tree1_2.role = blink::WebAXRoleTextField;
|
|
|
| // Process a load complete.
|
| std::vector<AccessibilityHostMsg_EventParams> params;
|
| params.push_back(AccessibilityHostMsg_EventParams());
|
| AccessibilityHostMsg_EventParams* msg = ¶ms[0];
|
| - msg->event_type = WebKit::WebAXEventLoadComplete;
|
| + msg->event_type = blink::WebAXEventLoadComplete;
|
| msg->nodes.push_back(tree1_1);
|
| msg->nodes.push_back(tree1_2);
|
| msg->id = tree1_1.id;
|
| @@ -645,18 +645,18 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
|
| EXPECT_NE(root, manager->GetRoot());
|
|
|
| // And the proper child remains.
|
| - EXPECT_EQ(WebKit::WebAXRoleTextField, acc1_2->role());
|
| + EXPECT_EQ(blink::WebAXRoleTextField, acc1_2->role());
|
| EXPECT_EQ(2, acc1_2->renderer_id());
|
|
|
| // Tree with a child button.
|
| AccessibilityNodeData tree2_1;
|
| tree2_1.id = 1;
|
| - tree2_1.role = WebKit::WebAXRoleRootWebArea;
|
| + tree2_1.role = blink::WebAXRoleRootWebArea;
|
| tree2_1.child_ids.push_back(3);
|
|
|
| AccessibilityNodeData tree2_2;
|
| tree2_2.id = 3;
|
| - tree2_2.role = WebKit::WebAXRoleButton;
|
| + tree2_2.role = blink::WebAXRoleButton;
|
|
|
| msg->nodes.clear();
|
| msg->nodes.push_back(tree2_1);
|
| @@ -672,7 +672,7 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
|
| EXPECT_NE(root, manager->GetRoot());
|
|
|
| // And the new child exists.
|
| - EXPECT_EQ(WebKit::WebAXRoleButton, acc2_2->role());
|
| + EXPECT_EQ(blink::WebAXRoleButton, acc2_2->role());
|
| EXPECT_EQ(3, acc2_2->renderer_id());
|
|
|
| // Ensure we properly cleaned up.
|
|
|