Use scoped_ptr instead of linked_ptr from /content/renderer

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 695 matching lines @@
       RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id_,
                                          MSG_ROUTING_NONE, MSG_ROUTING_NONE,
                                          params.replicated_frame_state);
     }
   }
 
   if (main_render_frame_)
     main_render_frame_->Initialize();
 
 #if defined(OS_ANDROID)
-  content_detectors_.push_back(linked_ptr<ContentDetector>(
-      new AddressDetector()));
+  content_detectors_.push_back(make_scoped_ptr(new AddressDetector()));
   const std::string& contry_iso =
       params.renderer_preferences.network_contry_iso;
   if (!contry_iso.empty()) {
-    content_detectors_.push_back(linked_ptr<ContentDetector>(
-        new PhoneNumberDetector(contry_iso)));
+    content_detectors_.push_back(
+        make_scoped_ptr(new PhoneNumberDetector(contry_iso)));
   }
-  content_detectors_.push_back(linked_ptr<ContentDetector>(
-      new EmailDetector()));
+  content_detectors_.push_back(make_scoped_ptr(new EmailDetector()));
 #endif
 
   RenderThread::Get()->AddRoute(routing_id_, this);
   // Take a reference on behalf of the RenderThread.  This will be balanced
   // when we receive ViewMsg_Close in the RenderWidget (which RenderView
   // inherits from).
   AddRef();
   if (RenderThreadImpl::current()) {
     RenderThreadImpl::current()->WidgetCreated();
     if (is_hidden_)
@@ skipping 2601 matching lines @@
     // queued which could DoS the user. Getting these is most likely a
     // programming error (there are many ways to DoS the user so it's not
     // considered a "real" security check), either in JS requesting many file
     // choosers to pop up, or in a plugin.
     //
     // TODO(brettw) we might possibly want to require a user gesture to open
     // a file picker, which will address this issue in a better way.
     return false;
   }
 
-  file_chooser_completions_.push_back(linked_ptr<PendingFileChooser>(
-      new PendingFileChooser(params, completion)));
+  file_chooser_completions_.push_back(
+      make_scoped_ptr(new PendingFileChooser(params, completion)));
   if (file_chooser_completions_.size() == 1) {
     // Actually show the browse dialog when this is the first request.
     Send(new ViewHostMsg_RunFileChooser(routing_id_, params));
   }
   return true;
 }
 
 blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() {
   if (!speech_recognition_dispatcher_)
     speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this);
@@ skipping 76 matching lines @@
       main_render_frame_->GetRoutingID(), signals));
 }
 
 #if defined(OS_ANDROID)
 WebContentDetectionResult RenderViewImpl::detectContentAround(
     const WebHitTestResult& touch_hit) {
   DCHECK(touch_hit.node().isTextNode());
 
   // Process the position with all the registered content detectors until
   // a match is found. Priority is provided by their relative order.
-  for (ContentDetectorList::const_iterator it = content_detectors_.begin();
-      it != content_detectors_.end(); ++it) {
-    ContentDetector::Result content = (*it)->FindTappedContent(touch_hit);
+  for (const auto& detector : content_detectors_) {
+    ContentDetector::Result content = detector->FindTappedContent(touch_hit);
     if (content.valid) {
       return WebContentDetectionResult(content.content_boundaries,
           base::UTF8ToUTF16(content.text), content.intent_url);
     }
   }
   return WebContentDetectionResult();
 }
 
 void RenderViewImpl::scheduleContentIntent(const WebURL& intent,
                                            bool is_main_frame) {
@@ skipping 254 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
     webview()->setZoomFactorForDeviceScaleFactor(
         device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
 }
 
 }  // namespace content