Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Side by Side Diff: content/browser/accessibility/browser_accessibility_mac_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/accessibility/browser_accessibility_cocoa.h" 10 #include "content/browser/accessibility/browser_accessibility_cocoa.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 child2.role = AccessibilityNodeData::ROLE_HEADING; 88 child2.role = AccessibilityNodeData::ROLE_HEADING;
89 89
90 delegate_.reset([[MockAccessibilityDelegate alloc] init]); 90 delegate_.reset([[MockAccessibilityDelegate alloc] init]);
91 manager_.reset( 91 manager_.reset(
92 new BrowserAccessibilityManagerMac(delegate_, root, NULL)); 92 new BrowserAccessibilityManagerMac(delegate_, root, NULL));
93 manager_->UpdateNodesForTesting(child1, child2); 93 manager_->UpdateNodesForTesting(child1, child2);
94 accessibility_.reset([manager_->GetRoot()->ToBrowserAccessibilityCocoa() 94 accessibility_.reset([manager_->GetRoot()->ToBrowserAccessibilityCocoa()
95 retain]); 95 retain]);
96 } 96 }
97 97
98 scoped_nsobject<MockAccessibilityDelegate> delegate_; 98 base::scoped_nsobject<MockAccessibilityDelegate> delegate_;
99 scoped_nsobject<BrowserAccessibilityCocoa> accessibility_; 99 base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_;
100 scoped_ptr<BrowserAccessibilityManager> manager_; 100 scoped_ptr<BrowserAccessibilityManager> manager_;
101 }; 101 };
102 102
103 // Standard hit test. 103 // Standard hit test.
104 TEST_F(BrowserAccessibilityTest, HitTestTest) { 104 TEST_F(BrowserAccessibilityTest, HitTestTest) {
105 BrowserAccessibilityCocoa* firstChild = 105 BrowserAccessibilityCocoa* firstChild =
106 [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)]; 106 [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)];
107 EXPECT_NSEQ(@"Child1", 107 EXPECT_NSEQ(@"Child1",
108 [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]); 108 [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
109 } 109 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 // Now any attributes we query should return nil. 157 // Now any attributes we query should return nil.
158 EXPECT_EQ(nil, [retainedFirstChild 158 EXPECT_EQ(nil, [retainedFirstChild
159 accessibilityAttributeValue:NSAccessibilityTitleAttribute]); 159 accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
160 160
161 // Don't leak memory in the test. 161 // Don't leak memory in the test.
162 [retainedFirstChild release]; 162 [retainedFirstChild release];
163 } 163 }
164 164
165 } // namespace content 165 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698