Remove unneeded extension_messages_browsertest.cc + cleanup.

chrome/renderer/extensions/extension_request_sender.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/renderer/extensions/extension_request_sender.h"
 
 #include "base/values.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
@@ skipping 78 matching lines @@
   WebKit::WebSecurityOrigin source_origin;
   WebKit::WebFrame* webframe = current_context->web_frame();
   if (webframe) {
     source_url = webframe->document().url();
     source_origin = webframe->document().securityOrigin();
   }
 
   v8::Persistent<v8::Context> v8_context =
       v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
   DCHECK(!v8_context.IsEmpty());
+
+  std::string extension_id = current_context->GetExtensionID();
   InsertRequest(request_id, new PendingRequest(
-      v8_context, name, current_context->extension_id()));
+      v8_context, name, extension_id));
 
   ExtensionHostMsg_Request_Params params;
   params.name = name;
   params.arguments.Swap(value_args);
-  params.extension_id = current_context->extension_id();
+  params.extension_id = extension_id;
   params.source_url = source_url;
   params.source_origin = source_origin.toString();
   params.request_id = request_id;
   params.has_callback = has_callback;
   params.user_gesture =
       webframe ? webframe->isProcessingUserGesture() : false;
   if (for_io_thread) {
     renderview->Send(new ExtensionHostMsg_RequestForIOThread(
         renderview->GetRoutingID(), params));
   } else {
@@ skipping 34 matching lines @@
                                            &retval));
   // In debug, the js will validate the callback parameters and return a
   // string if a validation error has occured.
 #ifndef NDEBUG
   if (!retval.IsEmpty() && !retval->IsUndefined()) {
     std::string error = *v8::String::AsciiValue(retval);
     DCHECK(false) << error;
   }
 #endif
 }