Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition.

chrome/browser/sync/glue/typed_url_model_associator_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/string_piece.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
@@ skipping 54 matching lines @@
   }
 };
 
 class TestTypedUrlModelAssociator : public TypedUrlModelAssociator {
  public:
   TestTypedUrlModelAssociator(base::WaitableEvent* startup,
                               base::WaitableEvent* aborted)
       : TypedUrlModelAssociator(&mock_, NULL, NULL),
         startup_(startup),
         aborted_(aborted) {}
-  virtual bool IsAbortPending() {
+  virtual bool IsAbortPending() OVERRIDE {
     // Let the main thread know that we've been started up, and block until
     // they've called Abort().
     startup_->Signal();
     EXPECT_TRUE(aborted_->TimedWait(TestTimeouts::action_timeout()));
     return TypedUrlModelAssociator::IsAbortPending();
   }
  private:
   ProfileSyncServiceMock mock_;
   base::WaitableEvent* startup_;
   base::WaitableEvent* aborted_;
@@ skipping 351 matching lines @@
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, callback);
   // Wait for the model associator to get created and start assocation.
   ASSERT_TRUE(startup.TimedWait(TestTimeouts::action_timeout()));
   // Abort the model assocation - this should be callable from any thread.
   associator->AbortAssociation();
   // Tell the remote thread to continue.
   aborted.Signal();
   // Block until CreateModelAssociator() exits.
   ASSERT_TRUE(done.TimedWait(TestTimeouts::action_timeout()));
 }