Disable DeviceOrientationproviderTest.ObserverNotRemoved on Linux

content/browser/device_orientation/provider_unittest.cc

 // Copyright (c) 2011 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 <queue>
 
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "content/browser/device_orientation/data_fetcher.h"
@@ skipping 230 matching lines @@
   checker_c->AddExpectation(kTestOrientations[1]);
   checker_c->AddExpectation(kTestOrientations[2]);
   orientation_factory->SetOrientation(kTestOrientations[2]);
   provider_->AddObserver(checker_c.get());
   MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_b.get());
   provider_->RemoveObserver(checker_c.get());
 }
 
-// Flaky. See crbug.com/104950.
+#if defined(OS_LINUX)
+// Flakily DCHECKs on Linux. See crbug.com/104950.
+#define MAYBE_ObserverNotRemoved DISABLED_ObserverNotRemoved
+#else
+#define MAYBE_ObserverNotRemoved ObserverNotRemoved
+#endif
 TEST_F(DeviceOrientationProviderTest, FLAKY_ObserverNotRemoved) {

[yosin_UTC9, 2011/11/23 07:21:17]

s/FLAKY_/MAYBE_/

   scoped_refptr<MockOrientationFactory> orientation_factory(
       new MockOrientationFactory());
   Init(MockOrientationFactory::CreateDataFetcher);
   const Orientation kTestOrientation(true, 1, true, 2, true, 3);
   const Orientation kTestOrientation2(true, 4, true, 5, true, 6);
 
   scoped_ptr<UpdateChecker> checker(new UpdateChecker(&pending_expectations_));
   checker->AddExpectation(kTestOrientation);
   orientation_factory->SetOrientation(kTestOrientation);
   provider_->AddObserver(checker.get());
@@ skipping 104 matching lines @@
   checker_b->AddExpectation(third_orientation);
   MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get());
   provider_->RemoveObserver(checker_b.get());
 }
 
 }  // namespace
 
 }  // namespace device_orientation