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

Side by Side Diff: chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc

Issue 1075463002: win: Make MusicManagerPrivateTest.DeviceIdValueReturned work on swarming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | chrome/test/data/extensions/platform_apps/music_manager_private/device_id_value_returned/chrometest.js » ('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 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 "extensions/test/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 ASSERT_TRUE(RunPlatformAppTest(
16 // Note: Some MacOS/Linux trybots seem to run under VMware, which assigns 16 "platform_apps/music_manager_private/device_id_value_returned"))
17 // MAC addresses that are blacklisted. We still want the test
18 // to succeed in that case.
19 const char* custom_arg = "device_id_may_be_undefined";
20 #else
21 const char* custom_arg = NULL;
22 #endif
23 ASSERT_TRUE(RunPlatformAppTestWithArg(
24 "platform_apps/music_manager_private/device_id_value_returned",
25 custom_arg))
26 << message_; 17 << message_;
27 } 18 }
28 19
29 #endif 20 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/music_manager_private/device_id_value_returned/chrometest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698