Fix activity logging for extension background pages.

extensions/renderer/dom_activity_logger.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/renderer/dom_activity_logger.h"
 
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/ad_injection_constants.h"
 #include "extensions/common/dom_action_types.h"
@@ skipping 35 matching lines @@
     : extension_id_(extension_id) {
 }
 
 DOMActivityLogger::~DOMActivityLogger() {}
 
 void DOMActivityLogger::AttachToWorld(int world_id,
                                       const std::string& extension_id) {
 #if defined(ENABLE_EXTENSIONS)
   // If there is no logger registered for world_id, construct a new logger
   // and register it with world_id.
-  if (!blink::hasDOMActivityLogger(world_id)) {
+  if (!blink::hasDOMActivityLogger(world_id,
+                                   WebString::fromUTF8(extension_id))) {
     DOMActivityLogger* logger = new DOMActivityLogger(extension_id);
-    blink::setDOMActivityLogger(world_id, logger);
+    blink::setDOMActivityLogger(world_id,
+                                WebString::fromUTF8(extension_id),
+                                logger);
   }
 #endif
 }
 
 void DOMActivityLogger::logGetter(const WebString& api_name,
                                   const WebURL& url,
                                   const WebString& title) {
   SendDomActionMessage(api_name.utf8(),
                        url,
                        title,
@@ skipping 44 matching lines @@
   params.api_call = api_call;
   params.url = url;
   params.url_title = url_title;
   params.call_type = call_type;
   params.arguments.Swap(args.get());
   content::RenderThread::Get()->Send(
       new ExtensionHostMsg_AddDOMActionToActivityLog(extension_id_, params));
 }
 
 }  // namespace extensions