Convert chrome/renderer to std::unique_ptr

BUG=554298 Review URL: https://codereview.chromium.org/1878653003 Cr-Commit-Position: refs/heads/master@{#386488}
cbchan · Apr 11, 2016 · fabb284 · fabb284
1 parent 32a5cfb
commit fabb284
Show file tree

Hide file tree

Showing 63 changed files with 359 additions and 293 deletions.
diff --git a/chrome/renderer/autofill/page_click_tracker_browsertest.cc b/chrome/renderer/autofill/page_click_tracker_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
+
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "components/autofill/content/renderer/page_click_listener.h"
 #include "components/autofill/content/renderer/page_click_tracker.h"
@@ -83,7 +85,7 @@ class PageClickTrackerTest : public ChromeRenderViewTest {
     ChromeRenderViewTest::TearDown();
   }
 
-  scoped_ptr<PageClickTracker> page_click_tracker_;
+  std::unique_ptr<PageClickTracker> page_click_tracker_;
   TestPageClickListener test_listener_;
   blink::WebElement text_;
   blink::WebElement textarea_;

diff --git a/chrome/renderer/autofill/password_generation_agent_browsertest.cc b/chrome/renderer/autofill/password_generation_agent_browsertest.cc
@@ -4,8 +4,9 @@
 
 #include <string.h>
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/renderer/autofill/password_generation_test_utils.h"

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ -523,9 +524,8 @@ void ChromeContentRendererClient::RenderViewCreated(
   new PageLoadHistograms(render_view);
 #if defined(ENABLE_PRINTING)
   new printing::PrintWebViewHelper(
-      render_view,
-      scoped_ptr<printing::PrintWebViewHelper::Delegate>(
-          new ChromePrintWebViewHelperDelegate()));
+      render_view, std::unique_ptr<printing::PrintWebViewHelper::Delegate>(
+                       new ChromePrintWebViewHelperDelegate()));
 #endif
 #if defined(ENABLE_SPELLCHECK)
   new SpellCheckProvider(render_view, spellcheck_.get());
@@ -782,7 +782,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
           break;
         }
 
-        scoped_ptr<content::PluginInstanceThrottler> throttler;
+        std::unique_ptr<content::PluginInstanceThrottler> throttler;
         if (power_saver_info.power_saver_enabled) {
           throttler = PluginInstanceThrottler::Create();
           // PluginPreroller manages its own lifetime.
@@ -1347,10 +1347,10 @@ void ChromeContentRendererClient::RecordRapporURL(const std::string& metric,
   RenderThread::Get()->Send(new ChromeViewHostMsg_RecordRapporURL(metric, url));
 }
 
-scoped_ptr<blink::WebAppBannerClient>
+std::unique_ptr<blink::WebAppBannerClient>
 ChromeContentRendererClient::CreateAppBannerClient(
     content::RenderFrame* render_frame) {
-  return scoped_ptr<blink::WebAppBannerClient>(
+  return std::unique_ptr<blink::WebAppBannerClient>(
       new AppBannerClient(render_frame));
 }
 

diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
@@ -8,13 +8,13 @@
 #include <stddef.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -140,7 +140,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   void RecordRappor(const std::string& metric,
                     const std::string& sample) override;
   void RecordRapporURL(const std::string& metric, const GURL& url) override;
-  scoped_ptr<blink::WebAppBannerClient> CreateAppBannerClient(
+  std::unique_ptr<blink::WebAppBannerClient> CreateAppBannerClient(
       content::RenderFrame* render_frame) override;
   void AddImageContextMenuProperties(
       const blink::WebURLResponse& response,
@@ -196,23 +196,23 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
                             blink::WebPluginParams* params);
 #endif
 
-  scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
-  scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
+  std::unique_ptr<ChromeRenderProcessObserver> chrome_observer_;
+  std::unique_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
 
-  scoped_ptr<network_hints::PrescientNetworkingDispatcher>
+  std::unique_ptr<network_hints::PrescientNetworkingDispatcher>
       prescient_networking_dispatcher_;
 
 #if defined(ENABLE_SPELLCHECK)
-  scoped_ptr<SpellCheck> spellcheck_;
+  std::unique_ptr<SpellCheck> spellcheck_;
 #endif
-  scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
-  scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
-  scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
+  std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
+  std::unique_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
+  std::unique_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
 #if defined(ENABLE_WEBRTC)
   scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
 #endif
 #if defined(ENABLE_PRINT_PREVIEW)
-  scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
+  std::unique_ptr<ChromePDFPrintClient> pdf_print_client_;
 #endif
 #if defined(ENABLE_PLUGINS)
   std::set<std::string> allowed_camera_device_origins_;

diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
@@ -5,7 +5,9 @@
 #include "chrome/renderer/chrome_render_process_observer.h"
 
 #include <stddef.h>
+
 #include <limits>
+#include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ -75,8 +77,8 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate {
       : weak_factory_(this) {
   }
 
-  scoped_ptr<content::RequestPeer> OnRequestComplete(
-      scoped_ptr<content::RequestPeer> current_peer,
+  std::unique_ptr<content::RequestPeer> OnRequestComplete(
+      std::unique_ptr<content::RequestPeer> current_peer,
       content::ResourceType resource_type,
       int error_code) override {
     // Update the browser about our cache.
@@ -98,8 +100,8 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate {
         resource_type, std::move(current_peer), error_code);
   }
 
-  scoped_ptr<content::RequestPeer> OnReceivedResponse(
-      scoped_ptr<content::RequestPeer> current_peer,
+  std::unique_ptr<content::RequestPeer> OnReceivedResponse(
+      std::unique_ptr<content::RequestPeer> current_peer,
       const std::string& mime_type,
       const GURL& url) override {
 #if defined(ENABLE_EXTENSIONS)

diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h
@@ -5,12 +5,12 @@
 #ifndef CHROME_RENDERER_CHROME_RENDER_PROCESS_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_PROCESS_OBSERVER_H_
 
+#include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/process/process.h"
@@ -66,7 +66,7 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver,
                             base::ProcessId sender_pid);
 
   static bool is_incognito_process_;
-  scoped_ptr<content::ResourceDispatcherDelegate> resource_delegate_;
+  std::unique_ptr<content::ResourceDispatcherDelegate> resource_delegate_;
   RendererContentSettingRules content_setting_rules_;
 
   base::WeakPtrFactory<ChromeRenderProcessObserver> weak_factory_;

diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/renderer/extensions/app_bindings.h"
 
+#include <memory>
+
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -83,10 +85,10 @@ v8::Local<v8::Value> AppBindings::GetDetailsImpl(blink::WebLocalFrame* frame) {
   if (!extension)
     return v8::Null(isolate);
 
-  scoped_ptr<base::DictionaryValue> manifest_copy(
+  std::unique_ptr<base::DictionaryValue> manifest_copy(
       extension->manifest()->value()->DeepCopy());
   manifest_copy->SetString("id", extension->id());
-  scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
+  std::unique_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   return converter->ToV8Value(manifest_copy.get(),
                               frame->mainWorldScriptContext());
 }

diff --git a/chrome/renderer/extensions/automation_internal_custom_bindings.cc b/chrome/renderer/extensions/automation_internal_custom_bindings.cc
@@ -7,9 +7,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"