Rename CancellationFlag to AtomicFlag.

chrome/browser/after_startup_task_utils.cc

 // Copyright 2015 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/after_startup_task_utils.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_info.h"
 #include "base/rand_util.h"
-#include "base/synchronization/cancellation_flag.h"
+#include "base/synchronization/atomic_flag.h"
 #include "base/task_runner.h"
 #include "base/tracked_objects.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 using content::BrowserThread;
 using content::WebContents;
 using content::WebContentsObserver;
-using StartupCompleteFlag = base::CancellationFlag;
 
 namespace {
 
 struct AfterStartupTask {
   AfterStartupTask(const tracked_objects::Location& from_here,
                    const scoped_refptr<base::TaskRunner>& task_runner,
                    const base::Closure& task)
       : from_here(from_here), task_runner(task_runner), task(task) {}
   ~AfterStartupTask() {}
 
   const tracked_objects::Location from_here;
   const scoped_refptr<base::TaskRunner> task_runner;
   const base::Closure task;
 };
 
 // The flag may be read on any thread, but must only be set on the UI thread.
-base::LazyInstance<StartupCompleteFlag>::Leaky g_startup_complete_flag;
+base::LazyInstance<base::AtomicFlag>::Leaky g_startup_complete_flag;
 
 // The queue may only be accessed on the UI thread.
 base::LazyInstance<std::deque<AfterStartupTask*>>::Leaky g_after_startup_tasks;
 
 bool IsBrowserStartupComplete() {
   // Be sure to initialize the LazyInstance on the main thread since the flag
   // may only be set on it's initializing thread.
   if (g_startup_complete_flag == nullptr)
     return false;
   return g_startup_complete_flag.Get().IsSet();
@@ skipping 165 matching lines @@
   return ::IsBrowserStartupComplete();
 }
 
 void AfterStartupTaskUtils::UnsafeResetForTesting() {
   DCHECK(g_after_startup_tasks.Get().empty());
   if (!IsBrowserStartupComplete())
     return;
   g_startup_complete_flag.Get().UnsafeResetForTesting();
   DCHECK(!IsBrowserStartupComplete());
 }