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

Side by Side Diff: content/renderer/accessibility/renderer_accessibility_browsertest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 12 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
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 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "base/time/time.h" 6 #include "base/time/time.h"
7 #include "content/common/frame_messages.h" 7 #include "content/common/frame_messages.h"
8 #include "content/common/view_message_enums.h" 8 #include "content/common/view_message_enums.h"
9 #include "content/public/test/render_view_test.h" 9 #include "content/public/test/render_view_test.h"
10 #include "content/renderer/accessibility/renderer_accessibility.h" 10 #include "content/renderer/accessibility/renderer_accessibility.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 void SetMode(AccessibilityMode mode) { 53 void SetMode(AccessibilityMode mode) {
54 frame()->OnSetAccessibilityMode(mode); 54 frame()->OnSetAccessibilityMode(mode);
55 } 55 }
56 56
57 void GetLastAccEvent( 57 void GetLastAccEvent(
58 AccessibilityHostMsg_EventParams* params) { 58 AccessibilityHostMsg_EventParams* params) {
59 const IPC::Message* message = 59 const IPC::Message* message =
60 sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID); 60 sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID);
61 ASSERT_TRUE(message); 61 ASSERT_TRUE(message);
62 Tuple2<std::vector<AccessibilityHostMsg_EventParams>, int> param; 62 Tuple<std::vector<AccessibilityHostMsg_EventParams>, int> param;
63 AccessibilityHostMsg_Events::Read(message, &param); 63 AccessibilityHostMsg_Events::Read(message, &param);
64 ASSERT_GE(param.a.size(), 1U); 64 ASSERT_GE(get<0>(param).size(), 1U);
65 *params = param.a[0]; 65 *params = get<0>(param)[0];
66 } 66 }
67 67
68 int CountAccessibilityNodesSentToBrowser() { 68 int CountAccessibilityNodesSentToBrowser() {
69 AccessibilityHostMsg_EventParams event; 69 AccessibilityHostMsg_EventParams event;
70 GetLastAccEvent(&event); 70 GetLastAccEvent(&event);
71 return event.update.nodes.size(); 71 return event.update.nodes.size();
72 } 72 }
73 73
74 protected: 74 protected:
75 IPC::TestSink* sink_; 75 IPC::TestSink* sink_;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // ignore it. 398 // ignore it.
399 sink_->ClearMessages(); 399 sink_->ClearMessages();
400 accessibility->HandleAXEvent(scroll_area, 400 accessibility->HandleAXEvent(scroll_area,
401 ui::AX_EVENT_VALUE_CHANGED); 401 ui::AX_EVENT_VALUE_CHANGED);
402 402
403 accessibility->SendPendingAccessibilityEvents(); 403 accessibility->SendPendingAccessibilityEvents();
404 404
405 const IPC::Message* message = 405 const IPC::Message* message =
406 sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID); 406 sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID);
407 ASSERT_TRUE(message); 407 ASSERT_TRUE(message);
408 Tuple2<std::vector<AccessibilityHostMsg_EventParams>, int> param; 408 Tuple<std::vector<AccessibilityHostMsg_EventParams>, int> param;
409 AccessibilityHostMsg_Events::Read(message, &param); 409 AccessibilityHostMsg_Events::Read(message, &param);
410 ASSERT_EQ(0U, param.a.size()); 410 ASSERT_EQ(0U, get<0>(param).size());
411 } 411 }
412 412
413 } // namespace content 413 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/media/video_encode_accelerator_unittest.cc ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698