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

android_webview/browser/renderer_host/aw_render_view_host_ext.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 "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/common/render_view_messages.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
@@ skipping 14 matching lines @@
 AwRenderViewHostExt::AwRenderViewHostExt(
     AwRenderViewHostExtClient* client, content::WebContents* contents)
     : content::WebContentsObserver(contents),
       client_(client),
       background_color_(SK_ColorWHITE),
       has_new_hit_test_data_(false) {
   DCHECK(client_);
 }
 
 AwRenderViewHostExt::~AwRenderViewHostExt() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   ClearImageRequests();
 }
 
 void AwRenderViewHostExt::DocumentHasImages(DocumentHasImagesResult result) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!web_contents()->GetRenderViewHost()) {
     result.Run(false);
     return;
   }
   static uint32_t next_id = 1;
   uint32_t this_id = next_id++;
   // Send the message to the main frame, instead of the whole frame tree,
   // because it only makes sense on the main frame.
   if (Send(new AwViewMsg_DocumentHasImages(
           web_contents()->GetMainFrame()->GetRoutingID(), this_id))) {
     image_requests_callback_map_[this_id] = result;
   } else {
     // Still have to respond to the API call WebView#docuemntHasImages.
     // Otherwise the listener of the response may be starved.
     result.Run(false);
   }
 }
 
 void AwRenderViewHostExt::ClearCache() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Send(new AwViewMsg_ClearCache);
 }
 
 void AwRenderViewHostExt::KillRenderProcess() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Send(new AwViewMsg_KillProcess);
 }
 
 bool AwRenderViewHostExt::HasNewHitTestData() const {
   return has_new_hit_test_data_;
 }
 
 void AwRenderViewHostExt::MarkHitTestDataRead() {
   has_new_hit_test_data_ = false;
 }
 
 void AwRenderViewHostExt::RequestNewHitTestDataAt(
     const gfx::PointF& touch_center,
     const gfx::SizeF& touch_area) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   // We only need to get blink::WebView on the renderer side to invoke the
   // blink hit test API, so sending this IPC to main frame is enough.
   Send(new AwViewMsg_DoHitTest(web_contents()->GetMainFrame()->GetRoutingID(),
                                touch_center, touch_area));
 }
 
 const AwHitTestData& AwRenderViewHostExt::GetLastHitTestData() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return last_hit_test_data_;
 }
 
 void AwRenderViewHostExt::SetTextZoomFactor(float factor) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Send(new AwViewMsg_SetTextZoomFactor(
       web_contents()->GetMainFrame()->GetRoutingID(), factor));
 }
 
 void AwRenderViewHostExt::ResetScrollAndScaleState() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Send(new AwViewMsg_ResetScrollAndScaleState(
       web_contents()->GetMainFrame()->GetRoutingID()));
 }
 
 void AwRenderViewHostExt::SetInitialPageScale(double page_scale_factor) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Send(new AwViewMsg_SetInitialPageScale(
       web_contents()->GetMainFrame()->GetRoutingID(), page_scale_factor));
 }
 
 void AwRenderViewHostExt::SetBackgroundColor(SkColor c) {
   if (background_color_ == c)
     return;
   background_color_ = c;
   if (web_contents()->GetRenderViewHost()) {
     Send(new AwViewMsg_SetBackgroundColor(
@@ skipping 36 matching lines @@
 
 void AwRenderViewHostExt::RenderFrameCreated(
     content::RenderFrameHost* frame_host) {
   frame_host->GetInterfaceRegistry()->AddInterface(
       base::Bind(&web_restrictions::WebRestrictionsMojoImplementation::Create,
                  AwBrowserContext::GetDefault()->GetWebRestrictionProvider()));
 }
 
 void AwRenderViewHostExt::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!navigation_handle->HasCommitted() ||
       (!navigation_handle->IsInMainFrame() &&
        !navigation_handle->HasSubframeNavigationEntryCommitted()))
     return;
 
   AwBrowserContext::FromWebContents(web_contents())
       ->AddVisitedURLs(navigation_handle->GetRedirectChain());
 }
 
 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
@@ skipping 22 matching lines @@
     content::RenderFrameHost* render_frame_host,
     int msg_id,
     bool has_images) {
   // Only makes sense coming from the main frame of the current frame tree.
   // This matches the current implementation that only cares about if there is
   // an img child node in the main document, and essentially invokes JS:
   // node.getElementsByTagName("img").
   if (render_frame_host != web_contents()->GetMainFrame())
     return;
 
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   std::map<int, DocumentHasImagesResult>::iterator pending_req =
       image_requests_callback_map_.find(msg_id);
   if (pending_req == image_requests_callback_map_.end()) {
     DLOG(WARNING) << "unexpected DocumentHasImages Response: " << msg_id;
   } else {
     pending_req->second.Run(has_images);
     image_requests_callback_map_.erase(pending_req);
   }
 }
 
 void AwRenderViewHostExt::OnUpdateHitTestData(
     content::RenderFrameHost* render_frame_host,
     const AwHitTestData& hit_test_data) {
   content::RenderFrameHost* main_frame_host = render_frame_host;
   while (main_frame_host->GetParent())
     main_frame_host = main_frame_host->GetParent();
 
   // Make sense from any frame of the current frame tree, because a focused
   // node could be in either the mainframe or a subframe.
   if (main_frame_host != web_contents()->GetMainFrame())
     return;
 
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   last_hit_test_data_ = hit_test_data;
   has_new_hit_test_data_ = true;
 }
 
 void AwRenderViewHostExt::OnContentsSizeChanged(
     content::RenderFrameHost* render_frame_host,
     const gfx::Size& contents_size) {
   // Only makes sense coming from the main frame of the current frame tree.
   if (render_frame_host != web_contents()->GetMainFrame())
     return;
 
   client_->OnWebLayoutContentsSizeChanged(contents_size);
 }
 
 }  // namespace android_webview