Revert "Enable MidiManagerWinrt by default on Windows 10"

media/midi/midi_switches.h

Index: media/midi/midi_switches.h
diff --git a/media/midi/midi_switches.h b/media/midi/midi_switches.h
index 46e010a933b5dd69e983f7c63d5aa57c84d2ef13..923533f2ae595e9d9614e318bab5cd43fbba83f4 100644
--- a/media/midi/midi_switches.h
+++ b/media/midi/midi_switches.h
@@ -17,10 +17,18 @@ namespace switches {
 MIDI_EXPORT extern const char kUseAndroidMidiApi[];
 #endif
 
+}  // namespace switches
+
+namespace media {

[Takashi Toyoshima, 2016/10/26 21:29:54]

Ah, now we are not inside the media namespace any more in ToT because
mojofication does not recommend to use nested namespace for a service.
Can you remove this though you will need it for beta branch.

[Shao-Chuan Lee, 2016/10/27 08:26:16]

Done.

+namespace midi {
+namespace features {
+
 #if defined(OS_WIN)
-MIDI_EXPORT extern const char kDisableWinrtMidiApi[];
+MIDI_EXPORT extern const base::Feature kMidiManagerWinrt;
 #endif
 
-}  // namespace switches
+}  // namespace features
+}  // namespace midi
+}  // namespace media
 
 #endif  // MEDIA_MIDI_MIDI_SWITCHES_H_