BrowserPlugin: Simplify guest access

extensions/browser/guest_view/guest_view_manager.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
@@ skipping 39 matching lines @@
   // Associates the Browser Plugin with |element_instance_id| to a
   // guest that has ID of |guest_instance_id| and sets initialization
   // parameters, |params| for it.
   void AttachGuest(int embedder_render_process_id,
                    int embedder_routing_id,
                    int element_instance_id,
                    int guest_instance_id,
                    const base::DictionaryValue& attach_params);
 
   int GetNextInstanceID();
-  int GetGuestInstanceIDForPluginID(
+  int GetGuestInstanceIDForElementID(
       content::WebContents* embedder_web_contents,
       int element_instance_id);
 
-
   typedef base::Callback<void(content::WebContents*)>
       WebContentsCreatedCallback;
   void CreateGuest(const std::string& view_type,
                    const std::string& embedder_extension_id,
                    content::WebContents* embedder_web_contents,
                    const base::DictionaryValue& create_params,
                    const WebContentsCreatedCallback& callback);
 
   content::WebContents* CreateGuestWithWebContentsParams(
       const std::string& view_type,
       const std::string& embedder_extension_id,
       int embedder_render_process_id,
       const content::WebContents::CreateParams& create_params);
 
   content::SiteInstance* GetGuestSiteInstance(
       const GURL& guest_site);
 
   // BrowserPluginGuestManager implementation.
-  virtual void MaybeGetGuestByInstanceIDOrKill(
+  virtual content::WebContents* GetGuestByInstanceID(
       content::WebContents* embedder_web_contents,
-      int element_instance_id,
-      const GuestByInstanceIDCallback& callback) OVERRIDE;
+      int element_instance_id) OVERRIDE;
   virtual bool ForEachGuest(content::WebContents* embedder_web_contents,
                             const GuestCallback& callback) OVERRIDE;
  protected:
   friend class GuestViewBase;
   FRIEND_TEST_ALL_PREFIXES(GuestViewManagerTest, AddRemove);
 
   // Can be overriden in tests.
   virtual void AddGuest(int guest_instance_id,
                         content::WebContents* guest_web_contents);
 
@@ skipping 53 matching lines @@
   std::set<int> removed_instance_ids_;
 
   content::BrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_