Disable LocalChangeObserverMultipleContexts instead of marking it flaky

chrome/browser/sync_file_system/local_file_sync_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 262 matching lines @@
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateDirectory(kDir));
   EXPECT_EQ(kTestFileDataSize,
             file_system_->WriteString(kFile, kTestFileData));
 
   EXPECT_EQ(2, num_changes_);
 }
 
 #if defined(OS_WIN) && defined(USE_AURA)
 // Flaky: http://crbug.com/171487
 #define MAYBE_LocalChangeObserverMultipleContexts\
-    FLAKY_LocalChangeObserverMultipleContexts
+    DISABLED_LocalChangeObserverMultipleContexts
 #else
 #define MAYBE_LocalChangeObserverMultipleContexts\
     LocalChangeObserverMultipleContexts
 #endif
 
 TEST_F(LocalFileSyncServiceTest, MAYBE_LocalChangeObserverMultipleContexts) {
   const char kOrigin2[] = "http://foo";
   fileapi::CannedSyncableFileSystem file_system2(
       GURL(kOrigin2), kServiceName,
       thread_helper_.io_task_runner(),
@@ skipping 266 matching lines @@
   }
 
   EXPECT_EQ(1U, changes.size());
   EXPECT_EQ(change, changes[0]);
 }
 
 // TODO(kinuko): Add tests for multiple file changes and multiple
 // FileSystemContexts.
 
 }  // namespace sync_file_system