Replace deprecated base::NonThreadSafe in chrome in favor of SequenceChecker.

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/sequence_checker.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"
@@ skipping 89 matching lines @@
     ScheduleTask(base::WrapUnique(queued_task));
   g_after_startup_tasks.Get().clear();
 
   // The shrink_to_fit() method is not available for all of our build targets.
   std::deque<AfterStartupTask*>(g_after_startup_tasks.Get())
       .swap(g_after_startup_tasks.Get());
 }
 
 // Observes the first visible page load and sets the startup complete
 // flag accordingly.
-class StartupObserver : public WebContentsObserver, public base::NonThreadSafe {
+class StartupObserver : public WebContentsObserver {
  public:
   StartupObserver() : weak_factory_(this) {}
-  ~StartupObserver() override { DCHECK(IsBrowserStartupComplete()); }
+  ~StartupObserver() override {
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+    DCHECK(IsBrowserStartupComplete());
+  }
 
   void Start();
 
  private:
   void OnStartupComplete() {
-    DCHECK(CalledOnValidThread());
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     SetBrowserStartupIsComplete();
     delete this;
   }
 
   void OnFailsafeTimeout() { OnStartupComplete(); }
 
   // WebContentsObserver overrides
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
                      const GURL& validated_url) override {
     if (!render_frame_host->GetParent())
       OnStartupComplete();
   }
 
   void DidFailLoad(content::RenderFrameHost* render_frame_host,
                    const GURL& validated_url,
                    int error_code,
                    const base::string16& error_description,
                    bool was_ignored_by_handler) override {
     if (!render_frame_host->GetParent())
       OnStartupComplete();
   }
 
   void WebContentsDestroyed() override { OnStartupComplete(); }
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   base::WeakPtrFactory<StartupObserver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupObserver);
 };
 
 void StartupObserver::Start() {
   // Signal completion quickly when there is no first page to load.
   const int kShortDelaySecs = 3;
   base::TimeDelta delay = base::TimeDelta::FromSeconds(kShortDelaySecs);
 
@@ skipping 83 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());
 }