Revert 203950 "Remove Activity Log usage of Extension objects"

trunk/src/chrome/browser/extensions/event_router.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/event_router.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 93 matching lines @@
                             FROM_HERE,
                             base::Bind(&LogExtensionEventMessage,
                                        profile_id,
                                        extension_id,
                                        event_name,
                                        base::Passed(&event_args)));
   } else {
     Profile* profile = reinterpret_cast<Profile*>(profile_id);
     if (!g_browser_process->profile_manager()->IsValidProfile(profile))
       return;
-    ActivityLog::GetInstance(profile)->LogEventAction(
-        extension_id, event_name, event_args.get(), std::string());
+
+    // An ExtensionService might not be running during unit tests, or an
+    // extension might have been unloaded by the time we get to logging it.  In
+    // those cases log a warning.
+    ExtensionService* extension_service =
+        ExtensionSystem::Get(profile)->extension_service();
+    if (!extension_service) {
+      LOG(WARNING) << "ExtensionService does not seem to be available "
+                   << "(this may be normal for unit tests)";
+    } else {
+      const Extension* extension =
+          extension_service->extensions()->GetByID(extension_id);
+      if (!extension) {
+        LOG(WARNING) << "Extension " << extension_id << " not found!";
+      } else {
+        ActivityLog::GetInstance(profile)->LogEventAction(
+            extension, event_name, event_args.get(), std::string());
+      }
+    }
   }
 }
 
 // static
 void EventRouter::DispatchExtensionMessage(IPC::Sender* ipc_sender,
                                            void* profile_id,
                                            const std::string& extension_id,
                                            const std::string& event_name,
                                            ListValue* event_args,
                                            UserGestureState user_gesture,
@@ skipping 720 matching lines @@
   copy->will_dispatch_callback = will_dispatch_callback;
   return copy;
 }
 
 EventListenerInfo::EventListenerInfo(const std::string& event_name,
                                      const std::string& extension_id)
     : event_name(event_name),
       extension_id(extension_id) {}
 
 }  // namespace extensions