Change scoped_ptr<FrameTreeNode> to FrameTreeNode*

content/browser/frame_host/frame_tree.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 "content/browser/frame_host/frame_tree.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 103 matching lines @@
                               // The top-level frame must always be in a
                               // document scope.
                               blink::WebTreeScopeType::Document,
                               std::string(),
                               blink::WebSandboxFlags::None)),
       focused_frame_tree_node_id_(-1),
       load_progress_(0.0) {
 }
 
 FrameTree::~FrameTree() {
+  delete root_;
+  root_ = nullptr;
 }
 
 FrameTreeNode* FrameTree::FindByID(int frame_tree_node_id) {
   FrameTreeNode* node = nullptr;
   ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node));
   return node;
 }
 
 FrameTreeNode* FrameTree::FindByRoutingID(int process_id, int routing_id) {
   RenderFrameHostImpl* render_frame_host =
@@ skipping 10 matching lines @@
     FrameTreeNode* result = render_frame_proxy_host->frame_tree_node();
     if (this == result->frame_tree())
       return result;
   }
 
   return nullptr;
 }
 
 FrameTreeNode* FrameTree::FindByName(const std::string& name) {
   if (name.empty())
-    return root_.get();
+    return root_;
 
   FrameTreeNode* node = nullptr;
   ForEach(base::Bind(&FrameTreeNodeForName, name, &node));
   return node;
 }
 
 void FrameTree::ForEach(
     const base::Callback<bool(FrameTreeNode*)>& on_node) const {
   ForEach(on_node, nullptr);
 }
 
 void FrameTree::ForEach(
     const base::Callback<bool(FrameTreeNode*)>& on_node,
     FrameTreeNode* skip_this_subtree) const {
   std::queue<FrameTreeNode*> queue;
-  queue.push(root_.get());
+  queue.push(root_);
 
   while (!queue.empty()) {
     FrameTreeNode* node = queue.front();
     queue.pop();
     if (skip_this_subtree == node)
       continue;
 
     if (!on_node.Run(node))
       break;
 
@@ skipping 174 matching lines @@
     CHECK(render_view_host_found);
   }
 }
 
 void FrameTree::FrameRemoved(FrameTreeNode* frame) {
   if (frame->frame_tree_node_id() == focused_frame_tree_node_id_)
     focused_frame_tree_node_id_ = -1;
 
   // No notification for the root frame.
   if (!frame->parent()) {
-    CHECK_EQ(frame, root_.get());
+    CHECK_EQ(frame, root_);
     return;
   }
 
   // Notify observers of the frame removal.
   if (!on_frame_removed_.is_null())
     on_frame_removed_.Run(frame->current_frame_host());
 }
 
 void FrameTree::UpdateLoadProgress() {
   double progress = 0.0;
@@ skipping 16 matching lines @@
   load_progress_ = 0.0;
 }
 
 bool FrameTree::IsLoading() {
   bool is_loading = false;
   ForEach(base::Bind(&IsNodeLoading, &is_loading));
   return is_loading;
 }
 
 }  // namespace content