Merge 279934 "aw: Fix hardware teardown race"

android_webview/native/aw_dev_tools_server.cc

 // Copyright 2013 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/native/aw_dev_tools_server.h"
 
 #include "android_webview/native/aw_contents.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
@@ skipping 126 matching lines @@
       "</html>";
   return html;
 }
 
 std::string GetViewDescription(WebContents* web_contents) {
   const android_webview::BrowserViewRenderer* bvr =
       android_webview::AwContents::FromWebContents(web_contents)
           ->GetBrowserViewRenderer();
   if (!bvr) return "";
   base::DictionaryValue description;
-  description.SetBoolean("attached", bvr->IsAttachedToWindow());
+  description.SetBoolean("attached", bvr->attached_to_window());
   description.SetBoolean("visible", bvr->IsVisible());
   gfx::Rect screen_rect = bvr->GetScreenRect();
   description.SetInteger("screenX", screen_rect.x());
   description.SetInteger("screenY", screen_rect.y());
   description.SetBoolean("empty", screen_rect.size().IsEmpty());
   if (!screen_rect.size().IsEmpty()) {
     description.SetInteger("width", screen_rect.width());
     description.SetInteger("height", screen_rect.height());
   }
   std::string json;
@@ skipping 61 matching lines @@
   AwDevToolsServer* devtools_server =
       reinterpret_cast<AwDevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }
 
 }  // namespace android_webview