| Index: chrome/browser/shell_integration_unittest.cc
|
| diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
|
| index f5c41cbe50911599b1f669688b395654af937d76..02fd70ed3a70c454a2fdd055c41ce1f079b2ba3f 100644
|
| --- a/chrome/browser/shell_integration_unittest.cc
|
| +++ b/chrome/browser/shell_integration_unittest.cc
|
| @@ -159,7 +159,13 @@ TEST(ShellIntegrationTest, GetDesktopShortcutFilename) {
|
| }
|
| }
|
|
|
| -TEST(ShellIntegrationTest, GetDesktopFileContents) {
|
| +// Fails on Linux Aura, see http://crbug.com/100346
|
| +#if defined(USE_AURA) && !defined(OS_WIN)
|
| +#define MAYBE_GetDesktopFileContents FAILS_GetDesktopFileContents
|
| +#else
|
| +#define MAYBE_GetDesktopFileContents GetDesktopFileContents
|
| +#endif
|
| +TEST(ShellIntegrationTest, MAYBE_GetDesktopFileContents) {
|
| const struct {
|
| const char* url;
|
| const char* title;
|
|
|