RefCounted types should not have public destructors, chrome/browser/ part 2

chrome/browser/sync/glue/ui_model_worker.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 "chrome/browser/sync/glue/ui_model_worker.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 26 matching lines @@
   *error_info = work.Run();
 
   // Notify the UIModelWorker that scheduled us that we have run
   // successfully.
   scheduler->OnTaskCompleted();
   work_done->Signal();  // Unblock the syncer thread that scheduled us.
 }
 
 }  // namespace
 
+UIModelWorker::UIModelWorker()
+    : state_(WORKING),
+      syncapi_has_shutdown_(false),
+      syncapi_event_(&lock_) {
+}
+
+void UIModelWorker::Stop() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  base::AutoLock lock(lock_);
+  DCHECK_EQ(state_, WORKING);
+
+  // We're on our own now, the beloved UI MessageLoop is no longer running.
+  // Any tasks scheduled or to be scheduled on the UI MessageLoop will not run.
+  state_ = RUNNING_MANUAL_SHUTDOWN_PUMP;
+
+  // Drain any final tasks manually until the SyncerThread tells us it has
+  // totally finished. There should only ever be 0 or 1 tasks Run() here.
+  while (!syncapi_has_shutdown_) {
+    if (!pending_work_.is_null())
+      pending_work_.Run();  // OnTaskCompleted will set reset |pending_work_|.
+
+    // Wait for either a new task or SyncerThread termination.
+    syncapi_event_.Wait();
+  }
+
+  state_ = STOPPED;
+}
+
 SyncerError UIModelWorker::DoWorkAndWaitUntilDone(
     const WorkCallback& work) {
   // In most cases, this method is called in WORKING state. It is possible this
   // gets called when we are in the RUNNING_MANUAL_SHUTDOWN_PUMP state, because
   // the UI loop has initiated shutdown but the syncer hasn't got the memo yet.
   // This is fine, the work will get scheduled and run normally or run by our
   // code handling this case in Stop(). Note there _no_ way we can be in here
   // with state_ = STOPPED, so it is safe to read / compare in this case.
   CHECK_NE(ANNOTATE_UNPROTECTED_READ(state_), STOPPED);
   SyncerError error_info;
@@ skipping 18 matching lines @@
       pending_work_.Reset();
       syncapi_event_.Signal();
       return error_info;
     }
   }
   syncapi_event_.Signal();  // Notify that the syncapi produced work for us.
   work_done.Wait();
   return error_info;
 }
 
-UIModelWorker::UIModelWorker()
-    : state_(WORKING),
-      syncapi_has_shutdown_(false),
-      syncapi_event_(&lock_) {
-}
-
-UIModelWorker::~UIModelWorker() {
-  DCHECK_EQ(state_, STOPPED);
+ModelSafeGroup UIModelWorker::GetModelSafeGroup() {
+  return GROUP_UI;
 }
 
 void UIModelWorker::OnSyncerShutdownComplete() {
   base::AutoLock lock(lock_);
   // The SyncerThread has terminated and we are no longer needed by syncapi.
   // The UI loop initiated shutdown and is (or will be) waiting in Stop().
   // We could either be WORKING or RUNNING_MANUAL_SHUTDOWN_PUMP, depending
   // on where we timeslice the UI thread in Stop; but we can't be STOPPED,
   // because that would imply OnSyncerShutdownComplete already signaled.
   DCHECK_NE(state_, STOPPED);
 
   syncapi_has_shutdown_ = true;
   syncapi_event_.Signal();
 }
 
-void UIModelWorker::Stop() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  base::AutoLock lock(lock_);
-  DCHECK_EQ(state_, WORKING);
-
-  // We're on our own now, the beloved UI MessageLoop is no longer running.
-  // Any tasks scheduled or to be scheduled on the UI MessageLoop will not run.
-  state_ = RUNNING_MANUAL_SHUTDOWN_PUMP;
-
-  // Drain any final tasks manually until the SyncerThread tells us it has
-  // totally finished. There should only ever be 0 or 1 tasks Run() here.
-  while (!syncapi_has_shutdown_) {
-    if (!pending_work_.is_null())
-      pending_work_.Run();  // OnTaskCompleted will set reset |pending_work_|.
-
-    // Wait for either a new task or SyncerThread termination.
-    syncapi_event_.Wait();
-  }
-
-  state_ = STOPPED;
-}
-
-ModelSafeGroup UIModelWorker::GetModelSafeGroup() {
-  return GROUP_UI;
+UIModelWorker::~UIModelWorker() {
+  DCHECK_EQ(state_, STOPPED);
 }
 
 }  // namespace browser_sync