Remove unneeded extension_messages_browsertest.cc + cleanup.

chrome/renderer/extensions/chrome_v8_context_set.cc

 // Copyright (c) 2011 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/renderer/extensions/chrome_v8_context_set.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
@@ skipping 99 matching lines @@
   // We copy the context list, because calling into javascript may modify it
   // out from under us.
   ContextSet contexts = GetAll();
 
   scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   for (ContextSet::iterator it = contexts.begin(); it != contexts.end();
        ++it) {
     if ((*it)->v8_context().IsEmpty())
       continue;
 
-    if (!extension_id.empty() && extension_id != (*it)->extension_id())
-      continue;
+    if (!extension_id.empty()) {
+      const Extension* extension = (*it)->extension();
+      if (!extension || (extension_id != extension->id()))
+        continue;
+    }
 
     content::RenderView* context_render_view = (*it)->GetRenderView();
     if (!context_render_view)
       continue;
 
     if (render_view && render_view != context_render_view)
       continue;
 
     if (!HasSufficientPermissions(context_render_view, event_url))
       continue;
@@ skipping 14 matching lines @@
     // TODO(rafaelw): Consider only doing this check if function_name ==
     // "Event.dispatchJSON".
 #ifndef NDEBUG
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
 #endif
   }
 }