Refactoring: de-couple Extensions from "script injection System" [render side] : 1

extensions/browser/api/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/web_view/web_view_internal_api.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 52 matching lines @@
 bool WebViewInternalNavigateFunction::RunAsyncSafe(WebViewGuest* guest) {
   scoped_ptr<webview::Navigate::Params> params(
       webview::Navigate::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   std::string src = params->src;
   guest->NavigateGuest(src, true /* force_navigation */);
   return true;
 }
 
 WebViewInternalExecuteCodeFunction::WebViewInternalExecuteCodeFunction()
-    : guest_instance_id_(0), guest_src_(GURL::EmptyGURL()) {
+    : guest_instance_id_(0),
+      guest_src_(GURL::EmptyGURL()),
+      script_injection_instance_id_(0) {
 }
 
 WebViewInternalExecuteCodeFunction::~WebViewInternalExecuteCodeFunction() {
 }
 
 bool WebViewInternalExecuteCodeFunction::Init() {
   if (details_.get())
     return true;
 
   if (!args_->GetInteger(0, &guest_instance_id_))
@@ skipping 11 matching lines @@
     return false;
 
   base::DictionaryValue* details_value = NULL;
   if (!args_->GetDictionary(2, &details_value))
     return false;
   scoped_ptr<InjectDetails> details(new InjectDetails());
   if (!InjectDetails::Populate(*details_value, details.get()))
     return false;
 
   details_ = details.Pass();
+  script_injection_instance_id_ = WebViewGuest::GetOrGenerateUniqueInstanceID(
+          render_view_host()->GetProcess()->GetID(), guest_instance_id_);
+
   return true;
 }
 
 bool WebViewInternalExecuteCodeFunction::ShouldInsertCSS() const {
   return false;
 }
 
 bool WebViewInternalExecuteCodeFunction::CanExecuteScriptOnPage() {
   return true;
 }
@@ skipping 11 matching lines @@
 }
 
 bool WebViewInternalExecuteCodeFunction::IsWebView() const {
   return true;
 }
 
 const GURL& WebViewInternalExecuteCodeFunction::GetWebViewSrc() const {
   return guest_src_;
 }
 
+int WebViewInternalExecuteCodeFunction:: GetScriptInjectionInstanceId() const {
+  return script_injection_instance_id_;
+}
+
 WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() {
 }
 
 void WebViewInternalExecuteScriptFunction::OnExecuteCodeFinished(
     const std::string& error,
     const GURL& on_url,
     const base::ListValue& result) {
   if (error.empty())
     SetResult(result.DeepCopy());
   WebViewInternalExecuteCodeFunction::OnExecuteCodeFinished(
@@ skipping 347 matching lines @@
   // Will finish asynchronously.
   return true;
 }
 
 void WebViewInternalClearDataFunction::ClearDataDone() {
   Release();  // Balanced in RunAsync().
   SendResponse(true);
 }
 
 }  // namespace extensions