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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura_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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 aura::Window* owner_; 356 aura::Window* owner_;
357 DISALLOW_COPY_AND_ASSIGN(FullscreenLayoutManager); 357 DISALLOW_COPY_AND_ASSIGN(FullscreenLayoutManager);
358 }; 358 };
359 359
360 class MockWindowObserver : public aura::WindowObserver { 360 class MockWindowObserver : public aura::WindowObserver {
361 public: 361 public:
362 MOCK_METHOD2(OnDelegatedFrameDamage, void(aura::Window*, const gfx::Rect&)); 362 MOCK_METHOD2(OnDelegatedFrameDamage, void(aura::Window*, const gfx::Rect&));
363 }; 363 };
364 364
365 const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) { 365 const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) {
366 PickleIterator iter(message); 366 base::PickleIterator iter(message);
367 const char* data; 367 const char* data;
368 int data_length; 368 int data_length;
369 if (!iter.ReadData(&data, &data_length)) 369 if (!iter.ReadData(&data, &data_length))
370 return NULL; 370 return NULL;
371 return reinterpret_cast<const WebInputEvent*>(data); 371 return reinterpret_cast<const WebInputEvent*>(data);
372 } 372 }
373 373
374 } // namespace 374 } // namespace
375 375
376 class RenderWidgetHostViewAuraTest : public testing::Test { 376 class RenderWidgetHostViewAuraTest : public testing::Test {
(...skipping 3192 matching lines...) Expand 10 before | Expand all | Expand 10 after
3569 ViewMsg_SetSurfaceIdNamespace::Read(msg, &params); 3569 ViewMsg_SetSurfaceIdNamespace::Read(msg, &params);
3570 view_->InitAsChild(NULL); 3570 view_->InitAsChild(NULL);
3571 view_->Show(); 3571 view_->Show();
3572 view_->SetSize(size); 3572 view_->SetSize(size);
3573 view_->OnSwapCompositorFrame(0, 3573 view_->OnSwapCompositorFrame(0,
3574 MakeDelegatedFrame(1.f, size, gfx::Rect(size))); 3574 MakeDelegatedFrame(1.f, size, gfx::Rect(size)));
3575 EXPECT_EQ(view_->GetSurfaceIdNamespace(), base::get<0>(params)); 3575 EXPECT_EQ(view_->GetSurfaceIdNamespace(), base::get<0>(params));
3576 } 3576 }
3577 3577
3578 } // namespace content 3578 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/sandbox_ipc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698