Fix webrequest api for webview in webui

extensions/browser/extension_function_dispatcher.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/extension_function_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/process/process.h"
+#include "base/strings/string_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/result_codes.h"
@@ skipping 198 matching lines @@
 // static
 void ExtensionFunctionDispatcher::DispatchOnIOThread(
     InfoMap* extension_info_map,
     void* profile_id,
     int render_process_id,
     base::WeakPtr<ExtensionMessageFilter> ipc_sender,
     int routing_id,
     const ExtensionHostMsg_Request_Params& params) {
   const Extension* extension =
       extension_info_map->extensions().GetByID(params.extension_id);
-  if (!extension)
-    return;
+  const std::string& extension_id = extension ?
+      extension->id() : base::EmptyString();
 
   ExtensionFunction::ResponseCallback callback(
       base::Bind(&IOThreadResponseCallback, ipc_sender, routing_id,
                  params.request_id));
 
   scoped_refptr<ExtensionFunction> function(
       CreateExtensionFunction(params,
                               extension,
                               render_process_id,
                               extension_info_map->process_map(),
                               g_global_io_data.Get().api.get(),
                               profile_id,
                               callback));
   if (!function.get())
     return;
 
   IOThreadExtensionFunction* function_io =
       function->AsIOThreadExtensionFunction();
   if (!function_io) {
     NOTREACHED();
     return;
   }
   function_io->set_ipc_sender(ipc_sender, routing_id);
   function_io->set_extension_info_map(extension_info_map);
-  function->set_include_incognito(
-      extension_info_map->IsIncognitoEnabled(extension->id()));
+  if (!extension_id.empty()) {

[not at google - send to devlin, 2014/10/22 19:12:06]

This isn't the same as the other code - see line 370 for what I mean.

[guohui, 2014/10/22 19:53:47]

Done.

+    function->set_include_incognito(
+        extension_info_map->IsIncognitoEnabled(extension_id));
+  }
 
   if (!CheckPermissions(function.get(), params, callback))
     return;
 
   QuotaService* quota = extension_info_map->GetQuotaService();
-  std::string violation_error = quota->Assess(extension->id(),
-                                              function.get(),
-                                              &params.arguments,
-                                              base::TimeTicks::Now());
+  const std::string& violation_error = extension_id.empty() ?
+      base::EmptyString() :
+      quota->Assess(extension_id, function.get(), &params.arguments,
+                    base::TimeTicks::Now());
   if (violation_error.empty()) {
     scoped_ptr<base::ListValue> args(params.arguments.DeepCopy());
-    NotifyApiFunctionCalled(extension->id(),
+    NotifyApiFunctionCalled(extension_id,
                             params.name,
                             args.Pass(),
                             static_cast<content::BrowserContext*>(profile_id));
     UMA_HISTOGRAM_SPARSE_SLOWLY("Extensions.FunctionCalls",
                                 function->histogram_value());
     function->Run()->Execute();
   } else {
     function->OnQuotaExceeded(violation_error);
   }
 }
@@ skipping 180 matching lines @@
 
 // static
 void ExtensionFunctionDispatcher::SendAccessDenied(
     const ExtensionFunction::ResponseCallback& callback) {
   base::ListValue empty_list;
   callback.Run(ExtensionFunction::FAILED, empty_list,
                "Access to extension API denied.");
 }
 
 }  // namespace extensions