Make UserScript non-copyable.

extensions/browser/declarative_user_script_master.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_master.h"
 
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/extension_user_script_loader.h"
 #include "extensions/browser/user_script_loader.h"
 #include "extensions/browser/web_ui_user_script_loader.h"
@@ skipping 13 matching lines @@
       break;
     case HostID::WEBUI:
       loader_.reset(new WebUIUserScriptLoader(browser_context, host_id));
       break;
   }
 }
 
 DeclarativeUserScriptMaster::~DeclarativeUserScriptMaster() {
 }
 
-void DeclarativeUserScriptMaster::AddScript(const UserScript& script) {
-  loader_->AddScripts(UserScriptList(1, script));

[Devlin, 2016/08/17 16:39:31]

Can we not use this vector ctor with non-movable types?

[lazyboy, 2016/08/17 18:55:52]

I can't seem to get std::unique_ptr<UserScriptList> foo(new UserScriptList(1,
std::move(script)) work.

error: call to deleted constructor of 'std::unique_ptr<extensions::UserScript,
std::default_delete<extensions::UserScript> >'

AFAIU, this constructor of std::vector makes copy, where it's failing.

+void DeclarativeUserScriptMaster::AddScript(
+    std::unique_ptr<UserScript> script) {
+  UserScriptList scripts;
+  scripts.push_back(std::move(script));
+  loader_->AddScripts(scripts);
 }
 
-void DeclarativeUserScriptMaster::AddScripts(const UserScriptList& scripts,
+void DeclarativeUserScriptMaster::AddScripts(UserScriptList& scripts,
                                              int render_process_id,
                                              int render_view_id) {
   loader_->AddScripts(scripts, render_process_id, render_view_id);
 }
 
-void DeclarativeUserScriptMaster::RemoveScript(const UserScript& script) {
-  std::set<UserScriptIDPair> set;
-  set.insert(UserScriptIDPair(script.id(), script.host_id()));
-  loader_->RemoveScripts(set);
+void DeclarativeUserScriptMaster::RemoveScript(const UserScriptIDPair& script) {
+  std::set<UserScriptIDPair> scripts;
+  scripts.insert(script);
+  RemoveScripts(scripts);
 }
 
 void DeclarativeUserScriptMaster::RemoveScripts(
     const std::set<UserScriptIDPair>& scripts) {
   loader_->RemoveScripts(scripts);
 }
 
 void DeclarativeUserScriptMaster::ClearScripts() {
   loader_->ClearScripts();
 }
 
 }  // namespace extensions