diff options
| author | Jenny Zhang <jennyz@chromium.org> | 2016-02-02 17:59:39 -0800 |
|---|---|---|
| committer | Jenny Zhang <jennyz@chromium.org> | 2016-02-03 02:01:26 +0000 |
| commit | 54ee3b0ab89f9d82401cfccd5f04eb556712a259 (patch) | |
| tree | 32b4ae61301ff60e3f295eafcb2cbfaaa0ac15e7 /extensions | |
| parent | e77a33831fb6ca5fcfbb23c46b286ffb00596454 (diff) | |
| download | chromium_src-54ee3b0ab89f9d82401cfccd5f04eb556712a259.zip chromium_src-54ee3b0ab89f9d82401cfccd5f04eb556712a259.tar.gz chromium_src-54ee3b0ab89f9d82401cfccd5f04eb556712a259.tar.bz2 | |
Revert "Store audio device's active state in preference"
This reverts commit fe100d54b8455fdc706744a7f39f7d36653b2693.
BUG=308143
TBR=rkc@chromium.org
Review URL: https://codereview.chromium.org/1661853002 .
Cr-Commit-Position: refs/branch-heads/2623@{#258}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/api/audio/audio_apitest.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/extensions/browser/api/audio/audio_apitest.cc b/extensions/browser/api/audio/audio_apitest.cc index d53bcd5..2fc0ce4 100644 --- a/extensions/browser/api/audio/audio_apitest.cc +++ b/extensions/browser/api/audio/audio_apitest.cc @@ -33,7 +33,6 @@ const uint64_t kWebcamMicId = 40003; const AudioNode kJabraSpeaker1(false, kJabraSpeaker1Id, - kJabraSpeaker1Id, "Jabra Speaker", "USB", "Jabra Speaker 1", @@ -42,7 +41,6 @@ const AudioNode kJabraSpeaker1(false, const AudioNode kJabraSpeaker2(false, kJabraSpeaker2Id, - kJabraSpeaker2Id, "Jabra Speaker", "USB", "Jabra Speaker 2", @@ -51,34 +49,20 @@ const AudioNode kJabraSpeaker2(false, const AudioNode kHDMIOutput(false, kHDMIOutputId, - kHDMIOutputId, "HDMI output", "HDMI", "HDA Intel MID", false, 0); -const AudioNode kJabraMic1(true, - kJabraMic1Id, - kJabraMic1Id, - "Jabra Mic", - "USB", - "Jabra Mic 1", - false, - 0); - -const AudioNode kJabraMic2(true, - kJabraMic2Id, - kJabraMic2Id, - "Jabra Mic", - "USB", - "Jabra Mic 2", - false, - 0); +const AudioNode + kJabraMic1(true, kJabraMic1Id, "Jabra Mic", "USB", "Jabra Mic 1", false, 0); + +const AudioNode + kJabraMic2(true, kJabraMic2Id, "Jabra Mic", "USB", "Jabra Mic 2", false, 0); const AudioNode kUSBCameraMic(true, kWebcamMicId, - kWebcamMicId, "Webcam Mic", "USB", "Logitech Webcam", |