Web MIDI: move MIDI message validating logic into message_util.{cc|h}

media/midi/midi_manager_win.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/midi/midi_manager_win.h"
 
 #include <windows.h>
 #include <ks.h>
 #include <ksmedia.h>
 #include <mmreg.h>
@@ skipping 25 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "base/win/message_window.h"
 #include "base/win/windows_version.h"
 #include "device/usb/usb_ids.h"
+#include "media/midi/message_util.h"
 #include "media/midi/midi_manager_winrt.h"
 #include "media/midi/midi_message_queue.h"
-#include "media/midi/midi_message_util.h"
 #include "media/midi/midi_port_info.h"
 #include "media/midi/midi_switches.h"
 
 namespace midi {
 namespace {
 
 using mojom::Result;
 
 static const size_t kBufferLength = 32 * 1024;
 
@@ skipping 639 matching lines @@
                                       DWORD_PTR param1,
                                       DWORD_PTR param2) {
     auto state = GetInputDeviceFromHandle(midi_in_handle);
     if (!state)
       return;
     const uint8_t status_byte = static_cast<uint8_t>(param1 & 0xff);
     const uint8_t first_data_byte = static_cast<uint8_t>((param1 >> 8) & 0xff);
     const uint8_t second_data_byte =
         static_cast<uint8_t>((param1 >> 16) & 0xff);
     const DWORD elapsed_ms = param2;
-    const size_t len = GetMidiMessageLength(status_byte);
+    const size_t len = GetMessageLength(status_byte);
     const uint8_t kData[] = {status_byte, first_data_byte, second_data_byte};
     std::vector<uint8_t> data;
     data.assign(kData, kData + len);
     DCHECK_LE(len, arraysize(kData));
     // MIM_DATA/MIM_LONGDATA message treats the time when midiInStart() is
     // called as the origin of |elapsed_ms|.
     // http://msdn.microsoft.com/en-us/library/windows/desktop/dd757284.aspx
     // http://msdn.microsoft.com/en-us/library/windows/desktop/dd757286.aspx
     const base::TimeTicks event_time =
         state->start_time + base::TimeDelta::FromMilliseconds(elapsed_ms);
@@ skipping 476 matching lines @@
 
 MidiManager* MidiManager::Create() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableWinrtMidiApi) &&
       base::win::GetVersion() >= base::win::VERSION_WIN10)
     return new MidiManagerWinrt();
   return new MidiManagerWin();
 }
 
 }  // namespace midi