Replace deprecated base::NonThreadSafe in chrome/browser/ui/views in favor of SequenceChecker.

chrome/browser/ui/views/status_icons/status_tray_win.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/ui/views/status_icons/status_tray_win.h"
 
 #include <commctrl.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
-#include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h"
 #include "chrome/common/chrome_constants.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 static const UINT kStatusIconMessage = WM_APP + 1;
 
 namespace {
 // |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
 const UINT kBaseIconId = 2;
 
 UINT ReservedIconId(StatusTray::StatusIconType type) {
   return kBaseIconId + static_cast<UINT>(type);
 }
 
 }  // namespace
 
 // Default implementation for StatusTrayStateChanger that communicates to
 // Exporer.exe via COM.  It spawns a background thread with a fresh COM
 // apartment and requests that the visibility be increased unless the user
 // has explicitly set the icon to be hidden.
-class StatusTrayStateChangerProxyImpl : public StatusTrayStateChangerProxy,
-                                        public base::NonThreadSafe {
+class StatusTrayStateChangerProxyImpl : public StatusTrayStateChangerProxy {
  public:
   StatusTrayStateChangerProxyImpl()
       : pending_requests_(0),
         worker_thread_("StatusIconCOMWorkerThread"),
         weak_factory_(this) {
     worker_thread_.init_com_with_mta(false);
   }
 
+  ~StatusTrayStateChangerProxyImpl() override {
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  }
+
   void EnqueueChange(UINT icon_id, HWND window) override {
-    DCHECK(CalledOnValidThread());
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     if (pending_requests_ == 0)
       worker_thread_.Start();
 
     ++pending_requests_;
     worker_thread_.task_runner()->PostTaskAndReply(
         FROM_HERE,
         base::Bind(
             &StatusTrayStateChangerProxyImpl::EnqueueChangeOnWorkerThread,
             icon_id, window),
         base::Bind(&StatusTrayStateChangerProxyImpl::ChangeDone,
                    weak_factory_.GetWeakPtr()));
   }
 
  private:
   // Must be called only on |worker_thread_|, to ensure the correct COM
   // apartment.
   static void EnqueueChangeOnWorkerThread(UINT icon_id, HWND window) {
     // It appears that IUnknowns are coincidentally compatible with
     // scoped_refptr.  Normally I wouldn't depend on that but it seems that
     // base::win::IUnknownImpl itself depends on that coincidence so it's
     // already being assumed elsewhere.
     scoped_refptr<StatusTrayStateChangerWin> status_tray_state_changer(
         new StatusTrayStateChangerWin(icon_id, window));
     status_tray_state_changer->EnsureTrayIconVisible();
   }
 
   // Called on UI thread.
   void ChangeDone() {
-    DCHECK(CalledOnValidThread());
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     DCHECK_GT(pending_requests_, 0);
 
     if (--pending_requests_ == 0)
       worker_thread_.Stop();
   }
 
  private:
   int pending_requests_;
   base::Thread worker_thread_;
+
+  SEQUENCE_CHECKER(sequence_checker_);
+
   base::WeakPtrFactory<StatusTrayStateChangerProxyImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusTrayStateChangerProxyImpl);
 };
 
 StatusTrayWin::StatusTrayWin()
     : next_icon_id_(1),
       atom_(0),
       instance_(NULL),
       window_(NULL) {
@@ skipping 131 matching lines @@
 }
 
 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest(
     std::unique_ptr<StatusTrayStateChangerProxy> proxy) {
   state_changer_proxy_ = std::move(proxy);
 }
 
 StatusTray* StatusTray::Create() {
   return new StatusTrayWin();
 }