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

Side by Side Diff: media/midi/midi_manager_usb_unittest.cc

Issue 1086073004: Web MIDI: namespace change from media to media::midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@null
Patch Set: (rebase) Created 5 years, 7 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
« no previous file with comments | « media/midi/midi_manager_usb.cc ('k') | media/midi/midi_manager_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 "media/midi/midi_manager_usb.h" 5 #include "media/midi/midi_manager_usb.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "media/midi/usb_midi_device.h" 13 #include "media/midi/usb_midi_device.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace media { 16 namespace media {
17 namespace midi {
17 18
18 namespace { 19 namespace {
19 20
20 template<typename T, size_t N> 21 template<typename T, size_t N>
21 std::vector<T> ToVector(const T (&array)[N]) { 22 std::vector<T> ToVector(const T (&array)[N]) {
22 return std::vector<T>(array, array + N); 23 return std::vector<T>(array, array + N);
23 } 24 }
24 25
25 class Logger { 26 class Logger {
26 public: 27 public:
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 ASSERT_EQ(2u, manager_->output_streams().size()); 566 ASSERT_EQ(2u, manager_->output_streams().size());
566 EXPECT_EQ(2u, manager_->output_streams()[0]->jack().jack_id); 567 EXPECT_EQ(2u, manager_->output_streams()[0]->jack().jack_id);
567 EXPECT_EQ(3u, manager_->output_streams()[1]->jack().jack_id); 568 EXPECT_EQ(3u, manager_->output_streams()[1]->jack().jack_id);
568 ASSERT_EQ(1u, jacks.size()); 569 ASSERT_EQ(1u, jacks.size());
569 EXPECT_EQ(2, jacks[0].endpoint_number()); 570 EXPECT_EQ(2, jacks[0].endpoint_number());
570 EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog()); 571 EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
571 } 572 }
572 573
573 } // namespace 574 } // namespace
574 575
576 } // namespace midi
575 } // namespace media 577 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager_usb.cc ('k') | media/midi/midi_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698