Refactor GuestViewContainer::AttachRequest to allow for other request types

extensions/renderer/guest_view/guest_view_internal_custom_bindings.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/guest_view/guest_view_internal_custom_bindings.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "content/public/renderer/render_view.h"
@@ skipping 26 matching lines @@
   CHECK(args[1]->IsInt32());
   // Attach Parameters.
   CHECK(args[2]->IsObject());
   // Optional Callback Function.
   CHECK(args.Length() < 4 || args[3]->IsFunction());
 
   int element_instance_id = args[0]->Int32Value();
   // An element instance ID uniquely identifies a ExtensionsGuestViewContainer
   // within a RenderView.
   ExtensionsGuestViewContainer* guest_view_container =
-      ExtensionsGuestViewContainer::FromID(
-          context()->GetRenderView()->GetRoutingID(), element_instance_id);
+      ExtensionsGuestViewContainer::FromID(element_instance_id);
 
   // TODO(fsamuel): Should we be reporting an error if the element instance ID
   // is invalid?
   if (!guest_view_container)
     return;
 
   int guest_instance_id = args[1]->Int32Value();
 
   scoped_ptr<base::DictionaryValue> params;
   {
     scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
     scoped_ptr<base::Value> params_as_value(
         converter->FromV8Value(args[2], context()->v8_context()));
     CHECK(params_as_value->IsType(base::Value::TYPE_DICTIONARY));
     params.reset(
         static_cast<base::DictionaryValue*>(params_as_value.release()));
   }
 
-  linked_ptr<ExtensionsGuestViewContainer::AttachRequest> request(
+  linked_ptr<ExtensionsGuestViewContainer::Request> request(
       new ExtensionsGuestViewContainer::AttachRequest(
-          element_instance_id,
+          guest_view_container,
           guest_instance_id,
           params.Pass(),
           args.Length() == 4 ? args[3].As<v8::Function>() :
               v8::Handle<v8::Function>(),
           args.GetIsolate()));
-  guest_view_container->AttachGuest(request);
+  guest_view_container->IssueRequest(request);
 
   args.GetReturnValue().Set(v8::Boolean::New(context()->isolate(), true));
 }
 
 }  // namespace extensions