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

Side by Side Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 564
565 void MoveTouchPoint(int index, int x, int y) { 565 void MoveTouchPoint(int index, int x, int y) {
566 touch_event_.MovePoint(index, x, y); 566 touch_event_.MovePoint(index, x, y);
567 } 567 }
568 568
569 void ReleaseTouchPoint(int index) { 569 void ReleaseTouchPoint(int index) {
570 touch_event_.ReleasePoint(index); 570 touch_event_.ReleasePoint(index);
571 } 571 }
572 572
573 const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) { 573 const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) {
574 PickleIterator iter(message); 574 base::PickleIterator iter(message);
575 const char* data; 575 const char* data;
576 int data_length; 576 int data_length;
577 if (!iter.ReadData(&data, &data_length)) 577 if (!iter.ReadData(&data, &data_length))
578 return NULL; 578 return NULL;
579 return reinterpret_cast<const WebInputEvent*>(data); 579 return reinterpret_cast<const WebInputEvent*>(data);
580 } 580 }
581 581
582 base::MessageLoopForUI message_loop_; 582 base::MessageLoopForUI message_loop_;
583 583
584 scoped_ptr<TestBrowserContext> browser_context_; 584 scoped_ptr<TestBrowserContext> browser_context_;
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 // Having an initial size set means that the size information had been sent 1543 // Having an initial size set means that the size information had been sent
1544 // with the reqiest to new up the RenderView and so subsequent WasResized 1544 // with the reqiest to new up the RenderView and so subsequent WasResized
1545 // calls should not result in new IPC (unless the size has actually changed). 1545 // calls should not result in new IPC (unless the size has actually changed).
1546 host_->WasResized(); 1546 host_->WasResized();
1547 EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID)); 1547 EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
1548 EXPECT_EQ(initial_size_, host_->old_resize_params_->new_size); 1548 EXPECT_EQ(initial_size_, host_->old_resize_params_->new_size);
1549 EXPECT_TRUE(host_->resize_ack_pending_); 1549 EXPECT_TRUE(host_->resize_ack_pending_);
1550 } 1550 }
1551 1551
1552 } // namespace content 1552 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698