| Index: chrome/browser/extensions/api/app_window/app_window_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
|
| index 5b20a4226b85d87f31c8734628324d0d1f95ba6e..b67b2464a352d5796ae855e95fdf6d51c1567fbd 100644
|
| --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc
|
| +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
|
| @@ -48,7 +48,14 @@ class TestAppWindowRegistryObserver : public apps::AppWindowRegistry::Observer {
|
| namespace extensions {
|
|
|
| // Tests chrome.app.window.setIcon.
|
| -IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) {
|
| +#if defined(OS_WIN) || defined(OS_LINUX)
|
| +// http://crbug.com/396466
|
| +#define MAYBE_WindowsApiSetIcon DISABLED_WindowsApiSetIcon
|
| +#else
|
| +#define MAYBE_WindowsApiSetIcon WindowsApiSetIcon
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest,
|
| + MAYBE_WindowsApiSetIcon) {
|
| scoped_ptr<TestAppWindowRegistryObserver> test_observer(
|
| new TestAppWindowRegistryObserver(browser()->profile()));
|
| LoadAndLaunchPlatformApp("windows_api_set_icon", "IconSet");
|
|
|