Rework some UserScriptLoader logic in preparation to removing UserScript copy.

extensions/browser/api/guest_view/web_view/web_view_internal_api.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/api/guest_view/web_view/web_view_internal_api.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 197 matching lines @@
 
   return true;
 }
 
 bool ParseContentScripts(
     const std::vector<ContentScriptDetails>& content_script_list,
     const extensions::Extension* extension,
     const HostID& host_id,
     bool incognito_enabled,
     const GURL& owner_base_url,
-    std::set<UserScript>* result,
+    extensions::UserScriptList* result,
     std::string* error) {
   if (content_script_list.empty())
     return false;
 
   std::set<std::string> names;
   for (const ContentScriptDetails& script_value : content_script_list) {
     const std::string& name = script_value.name;
     if (!names.insert(name).second) {
       // The name was already in the list.
       *error = kDuplicatedContentScriptNamesError;
       return false;
     }
 
     UserScript script;
     if (!ParseContentScript(script_value, extension, owner_base_url, &script,
                             error))
       return false;
 
     script.set_id(UserScript::GenerateUserScriptID());
     script.set_name(name);
     script.set_incognito_enabled(incognito_enabled);
     script.set_host_id(host_id);
     script.set_consumer_instance_type(UserScript::WEBVIEW);
-    result->insert(script);
+    result->push_back(script);
   }
   return true;
 }
 
 }  // namespace
 
 namespace extensions {
 
 bool LegacyWebViewInternalExtensionFunction::RunAsync() {
   int instance_id = 0;
@@ skipping 240 matching lines @@
 WebViewInternalAddContentScriptsFunction::Run() {
   std::unique_ptr<web_view_internal::AddContentScripts::Params> params(
       web_view_internal::AddContentScripts::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (!params->instance_id)
     return RespondNow(Error(kViewInstanceIdError));
 
   GURL owner_base_url(
       render_frame_host()->GetSiteInstance()->GetSiteURL().GetWithEmptyPath());
-  std::set<UserScript> result;
-
   content::WebContents* sender_web_contents = GetSenderWebContents();
   HostID host_id = GenerateHostIDFromEmbedder(extension(), sender_web_contents);
   bool incognito_enabled = browser_context()->IsOffTheRecord();
 
+  UserScriptList result;
   if (!ParseContentScripts(params->content_script_list, extension(), host_id,
                            incognito_enabled, owner_base_url, &result, &error_))
     return RespondNow(Error(error_));
 
   WebViewContentScriptManager* manager =
       WebViewContentScriptManager::Get(browser_context());
   DCHECK(manager);
 
   manager->AddContentScripts(
       sender_web_contents->GetRenderProcessHost()->GetID(), render_frame_host(),
@@ skipping 446 matching lines @@
   // Will finish asynchronously.
   return true;
 }
 
 void WebViewInternalClearDataFunction::ClearDataDone() {
   Release();  // Balanced in RunAsync().
   SendResponse(true);
 }
 
 }  // namespace extensions