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

Side by Side Diff: extensions/browser/api/audio/audio_apitest.cc

Issue 1584613003: Expose stable_device_id in audio extension apis. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « no previous file | extensions/browser/api/audio/audio_service_chromeos.cc » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "extensions/shell/test/shell_apitest.h" 10 #include "extensions/shell/test/shell_apitest.h"
11 #if defined(OS_CHROMEOS) 11 #if defined(OS_CHROMEOS)
12 #include "chromeos/audio/audio_devices_pref_handler_stub.h" 12 #include "chromeos/audio/audio_devices_pref_handler_stub.h"
13 #include "chromeos/audio/cras_audio_handler.h" 13 #include "chromeos/audio/cras_audio_handler.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/dbus/fake_cras_audio_client.h" 15 #include "chromeos/dbus/fake_cras_audio_client.h"
16 #endif 16 #endif
17 #include "extensions/test/extension_test_message_listener.h" 17 #include "extensions/test/extension_test_message_listener.h"
18 18
19 namespace extensions { 19 namespace extensions {
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 using chromeos::AudioDevice; 22 using chromeos::AudioDevice;
23 using chromeos::AudioDeviceList; 23 using chromeos::AudioDeviceList;
24 using chromeos::AudioNode; 24 using chromeos::AudioNode;
25 using chromeos::AudioNodeList; 25 using chromeos::AudioNodeList;
26 26
27 const uint64_t kJabraSpeaker1Id = 30001; 27 const uint64_t kJabraSpeaker1Id = 30001;
28 const uint64_t kJabraSpeaker1StableDeviceId = 80001;
28 const uint64_t kJabraSpeaker2Id = 30002; 29 const uint64_t kJabraSpeaker2Id = 30002;
30 const uint64_t kJabraSpeaker2StableDeviceId = 80002;
29 const uint64_t kHDMIOutputId = 30003; 31 const uint64_t kHDMIOutputId = 30003;
32 const uint64_t kHDMIOutputStabeDevicelId = 80003;
30 const uint64_t kJabraMic1Id = 40001; 33 const uint64_t kJabraMic1Id = 40001;
34 const uint64_t kJabraMic1StableDeviceId = 90001;
31 const uint64_t kJabraMic2Id = 40002; 35 const uint64_t kJabraMic2Id = 40002;
36 const uint64_t kJabraMic2StableDeviceId = 90002;
32 const uint64_t kWebcamMicId = 40003; 37 const uint64_t kWebcamMicId = 40003;
38 const uint64_t kWebcamMicStableDeviceId = 90003;
33 39
34 const AudioNode kJabraSpeaker1(false, 40 const AudioNode kJabraSpeaker1(false,
35 kJabraSpeaker1Id, 41 kJabraSpeaker1Id,
36 kJabraSpeaker1Id, 42 kJabraSpeaker1StableDeviceId,
37 "Jabra Speaker", 43 "Jabra Speaker",
38 "USB", 44 "USB",
39 "Jabra Speaker 1", 45 "Jabra Speaker 1",
40 false, 46 false,
41 0); 47 0);
42 48
43 const AudioNode kJabraSpeaker2(false, 49 const AudioNode kJabraSpeaker2(false,
44 kJabraSpeaker2Id, 50 kJabraSpeaker2Id,
45 kJabraSpeaker2Id, 51 kJabraSpeaker2StableDeviceId,
46 "Jabra Speaker", 52 "Jabra Speaker",
47 "USB", 53 "USB",
48 "Jabra Speaker 2", 54 "Jabra Speaker 2",
49 false, 55 false,
50 0); 56 0);
51 57
52 const AudioNode kHDMIOutput(false, 58 const AudioNode kHDMIOutput(false,
53 kHDMIOutputId, 59 kHDMIOutputId,
54 kHDMIOutputId, 60 kHDMIOutputStabeDevicelId,
55 "HDMI output", 61 "HDMI output",
56 "HDMI", 62 "HDMI",
57 "HDA Intel MID", 63 "HDA Intel MID",
58 false, 64 false,
59 0); 65 0);
60 66
61 const AudioNode kJabraMic1(true, 67 const AudioNode kJabraMic1(true,
62 kJabraMic1Id, 68 kJabraMic1Id,
63 kJabraMic1Id, 69 kJabraMic1StableDeviceId,
64 "Jabra Mic", 70 "Jabra Mic",
65 "USB", 71 "USB",
66 "Jabra Mic 1", 72 "Jabra Mic 1",
67 false, 73 false,
68 0); 74 0);
69 75
70 const AudioNode kJabraMic2(true, 76 const AudioNode kJabraMic2(true,
71 kJabraMic2Id, 77 kJabraMic2Id,
72 kJabraMic2Id, 78 kJabraMic2StableDeviceId,
73 "Jabra Mic", 79 "Jabra Mic",
74 "USB", 80 "USB",
75 "Jabra Mic 2", 81 "Jabra Mic 2",
76 false, 82 false,
77 0); 83 0);
78 84
79 const AudioNode kUSBCameraMic(true, 85 const AudioNode kUSBCameraMic(true,
80 kWebcamMicId, 86 kWebcamMicId,
81 kWebcamMicId, 87 kWebcamMicStableDeviceId,
82 "Webcam Mic", 88 "Webcam Mic",
83 "USB", 89 "USB",
84 "Logitech Webcam", 90 "Logitech Webcam",
85 false, 91 false,
86 0); 92 0);
87 93
88 class AudioApiTest : public ShellApiTest { 94 class AudioApiTest : public ShellApiTest {
89 public: 95 public:
90 AudioApiTest() : cras_audio_handler_(NULL), fake_cras_audio_client_(NULL) {} 96 AudioApiTest() : cras_audio_handler_(NULL), fake_cras_audio_client_(NULL) {}
91 ~AudioApiTest() override {} 97 ~AudioApiTest() override {}
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 290
285 // Verify the background app got the onNodesChanged event 291 // Verify the background app got the onNodesChanged event
286 // with the last node removed. 292 // with the last node removed.
287 ASSERT_TRUE(result_listener.WaitUntilSatisfied()); 293 ASSERT_TRUE(result_listener.WaitUntilSatisfied());
288 EXPECT_EQ("success", result_listener.message()); 294 EXPECT_EQ("success", result_listener.message());
289 } 295 }
290 296
291 #endif // OS_CHROMEOS 297 #endif // OS_CHROMEOS
292 298
293 } // namespace extensions 299 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | extensions/browser/api/audio/audio_service_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698