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

Side by Side Diff: content/renderer/media/render_media_log_unittest.cc

Issue 1159553007: Move Tuple to base namespace. (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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/test/simple_test_tick_clock.h" 5 #include "base/test/simple_test_tick_clock.h"
6 #include "base/test/test_mock_time_task_runner.h" 6 #include "base/test/test_mock_time_task_runner.h"
7 #include "content/common/view_messages.h" 7 #include "content/common/view_messages.h"
8 #include "content/public/test/mock_render_thread.h" 8 #include "content/public/test/mock_render_thread.h"
9 #include "content/renderer/media/render_media_log.h" 9 #include "content/renderer/media/render_media_log.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 26 matching lines...) Expand all
37 int message_count() { return render_thread_.sink().message_count(); } 37 int message_count() { return render_thread_.sink().message_count(); }
38 38
39 std::vector<media::MediaLogEvent> GetMediaLogEvents() { 39 std::vector<media::MediaLogEvent> GetMediaLogEvents() {
40 const IPC::Message* msg = render_thread_.sink().GetFirstMessageMatching( 40 const IPC::Message* msg = render_thread_.sink().GetFirstMessageMatching(
41 ViewHostMsg_MediaLogEvents::ID); 41 ViewHostMsg_MediaLogEvents::ID);
42 if (!msg) { 42 if (!msg) {
43 ADD_FAILURE() << "Did not find ViewHostMsg_MediaLogEvents IPC message"; 43 ADD_FAILURE() << "Did not find ViewHostMsg_MediaLogEvents IPC message";
44 return std::vector<media::MediaLogEvent>(); 44 return std::vector<media::MediaLogEvent>();
45 } 45 }
46 46
47 Tuple<std::vector<media::MediaLogEvent>> events; 47 base::Tuple<std::vector<media::MediaLogEvent>> events;
48 ViewHostMsg_MediaLogEvents::Read(msg, &events); 48 ViewHostMsg_MediaLogEvents::Read(msg, &events);
49 return get<0>(events); 49 return base::get<0>(events);
50 } 50 }
51 51
52 private: 52 private:
53 base::MessageLoop message_loop_; 53 base::MessageLoop message_loop_;
54 MockRenderThread render_thread_; 54 MockRenderThread render_thread_;
55 scoped_refptr<RenderMediaLog> log_; 55 scoped_refptr<RenderMediaLog> log_;
56 base::SimpleTestTickClock* tick_clock_; // Owned by |log_|. 56 base::SimpleTestTickClock* tick_clock_; // Owned by |log_|.
57 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_; 57 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(RenderMediaLogTest); 59 DISALLOW_COPY_AND_ASSIGN(RenderMediaLogTest);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // Verify contents. There should only be a single buffered extents changed 112 // Verify contents. There should only be a single buffered extents changed
113 // event. 113 // event.
114 std::vector<media::MediaLogEvent> events = GetMediaLogEvents(); 114 std::vector<media::MediaLogEvent> events = GetMediaLogEvents();
115 ASSERT_EQ(3u, events.size()); 115 ASSERT_EQ(3u, events.size());
116 EXPECT_EQ(media::MediaLogEvent::LOAD, events[0].type); 116 EXPECT_EQ(media::MediaLogEvent::LOAD, events[0].type);
117 EXPECT_EQ(media::MediaLogEvent::SEEK, events[1].type); 117 EXPECT_EQ(media::MediaLogEvent::SEEK, events[1].type);
118 EXPECT_EQ(media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED, events[2].type); 118 EXPECT_EQ(media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED, events[2].type);
119 } 119 }
120 120
121 } // namespace content 121 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/input/input_event_filter_unittest.cc ('k') | content/renderer/pepper/pepper_file_chooser_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698