Some linked_ptr -> unique_ptr conversion in extensions/browser.

extensions/browser/declarative_user_script_manager.cc

 // Copyright 2014 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 "extensions/browser/declarative_user_script_manager.h"
 
+#include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/declarative_user_script_manager_factory.h"
 #include "extensions/browser/declarative_user_script_master.h"
 #include "extensions/browser/extension_registry.h"
 
 namespace extensions {
 
 DeclarativeUserScriptManager::DeclarativeUserScriptManager(
     content::BrowserContext* browser_context)
     : browser_context_(browser_context), extension_registry_observer_(this) {
@@ skipping 18 matching lines @@
 
   if (it != declarative_user_script_masters_.end())
     return it->second.get();
 
   return CreateDeclarativeUserScriptMaster(host_id);
 }
 
 DeclarativeUserScriptMaster*
 DeclarativeUserScriptManager::CreateDeclarativeUserScriptMaster(
     const HostID& host_id) {
-  linked_ptr<DeclarativeUserScriptMaster> master(
-      new DeclarativeUserScriptMaster(browser_context_, host_id));
-  declarative_user_script_masters_[host_id] = master;
-  return master.get();
+  DeclarativeUserScriptMaster* master =
+      new DeclarativeUserScriptMaster(browser_context_, host_id);
+  declarative_user_script_masters_[host_id] = base::WrapUnique(master);

[Devlin, 2016/08/30 19:21:54]

MakeUnique inlined?

[lazyboy, 2016/08/30 20:30:56]

Need raw ptr on next line. Currently this is done without a second lookup.

[Devlin, 2016/08/30 22:48:28]

// Insert a new DeclarativeUserScriptMaster and return a ptr to it.
return declarative_user_script_masters_.insert(std::make_pair(
    host_id, base::MakeUnique<DeclarativeUserScriptMaster>(browser_context_,
host_id))).second->second.get();

I'd prefer that, because it avoids any "bare news" and references after wrapping
something (and I think it's clear enough with the comment).  But I can
understand if you'd prefer this for the legibility.

[lazyboy, 2016/08/30 23:28:29]

Done.

+  return master;
 }
 
 void DeclarativeUserScriptManager::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   for (const auto& val : declarative_user_script_masters_) {
     DeclarativeUserScriptMaster* master = val.second.get();
     if (master->host_id().id() == extension->id())
       master->ClearScripts();
   }
 }
 
 }  // namespace extensions