| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "extensions/test/extension_test_message_listener.h" |
| 7 | 7 |
| 8 // Supported on all platforms, but on Windows only if RLZ is enabled. | 8 // Supported on all platforms, but on Windows only if RLZ is enabled. |
| 9 #if !defined(OS_WIN) || defined(ENABLE_RLZ) | 9 #if !defined(OS_WIN) || defined(ENABLE_RLZ) |
| 10 | 10 |
| 11 class MusicManagerPrivateTest : public extensions::PlatformAppBrowserTest { | 11 class MusicManagerPrivateTest : public extensions::PlatformAppBrowserTest { |
| 12 }; | 12 }; |
| 13 | 13 |
| 14 IN_PROC_BROWSER_TEST_F(MusicManagerPrivateTest, DeviceIdValueReturned) { | 14 IN_PROC_BROWSER_TEST_F(MusicManagerPrivateTest, DeviceIdValueReturned) { |
| 15 #if defined(OS_MACOSX) || defined(OS_LINUX) | 15 #if defined(OS_MACOSX) || defined(OS_LINUX) |
| 16 // Note: Some MacOS/Linux trybots seem to run under VMware, which assigns | 16 // Note: Some MacOS/Linux trybots seem to run under VMware, which assigns |
| 17 // MAC addresses that are blacklisted. We still want the test | 17 // MAC addresses that are blacklisted. We still want the test |
| 18 // to succeed in that case. | 18 // to succeed in that case. |
| 19 const char* custom_arg = "device_id_may_be_undefined"; | 19 const char* custom_arg = "device_id_may_be_undefined"; |
| 20 #else | 20 #else |
| 21 const char* custom_arg = NULL; | 21 const char* custom_arg = NULL; |
| 22 #endif | 22 #endif |
| 23 ASSERT_TRUE(RunPlatformAppTestWithArg( | 23 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 24 "platform_apps/music_manager_private/device_id_value_returned", | 24 "platform_apps/music_manager_private/device_id_value_returned", |
| 25 custom_arg)) | 25 custom_arg)) |
| 26 << message_; | 26 << message_; |
| 27 } | 27 } |
| 28 | 28 |
| 29 #endif | 29 #endif |
| OLD | NEW |