Rename RenderProcessHost::IsGuest to RenderProcessHost::IsIsolatedGuest

chrome/browser/guest_view/guest_view_manager.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 "chrome/browser/guest_view/guest_view_manager.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_system.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 
 using content::BrowserContext;
 using content::SiteInstance;
 using content::WebContents;
 
-// A WebContents does not immediately have a RenderProcessHost. It acquires one
-// on initial navigation. This observer exists until that initial navigation in
-// order to grab the ID if tis RenderProcessHost so that it can register it as
-// a guest.
-class GuestWebContentsObserver
-    : public content::WebContentsObserver {
- public:
-  explicit GuestWebContentsObserver(WebContents* guest_web_contents)
-      : WebContentsObserver(guest_web_contents) {
-  }
-
-  virtual ~GuestWebContentsObserver() {
-  }
-
-  // WebContentsObserver:
-  virtual void DidStartProvisionalLoadForFrame(
-      int64 frame_id,
-      int64 parent_frame_id,
-      bool is_main_frame,
-      const GURL& validated_url,
-      bool is_error_page,
-      bool is_iframe_srcdoc,
-      content::RenderViewHost* render_view_host) OVERRIDE {
-    GuestViewManager::FromBrowserContext(web_contents()->GetBrowserContext())->
-        AddRenderProcessHostID(web_contents()->GetRenderProcessHost()->GetID());
-    delete this;
-  }
-
-  virtual void WebContentsDestroyed() OVERRIDE {
-    delete this;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GuestWebContentsObserver);
-};
-
 GuestViewManager::GuestViewManager(content::BrowserContext* context)
     : current_instance_id_(0), last_instance_id_removed_(0), context_(context) {
 }
 
 GuestViewManager::~GuestViewManager() {}
 
 // static.
 GuestViewManager* GuestViewManager::FromBrowserContext(
     BrowserContext* context) {
   GuestViewManager* guest_manager =
@@ skipping 114 matching lines @@
       return true;
   }
   return false;
 }
 
 void GuestViewManager::AddGuest(int guest_instance_id,
                                 WebContents* guest_web_contents) {
   CHECK(!ContainsKey(guest_web_contents_by_instance_id_, guest_instance_id));
   CHECK(CanUseGuestInstanceID(guest_instance_id));
   guest_web_contents_by_instance_id_[guest_instance_id] = guest_web_contents;
-  // This will add the RenderProcessHost ID when we get one.
-  new GuestWebContentsObserver(guest_web_contents);
 }
 
 void GuestViewManager::RemoveGuest(int guest_instance_id) {
   GuestInstanceMap::iterator it =
       guest_web_contents_by_instance_id_.find(guest_instance_id);
   DCHECK(it != guest_web_contents_by_instance_id_.end());
-  render_process_host_id_multiset_.erase(
-      it->second->GetRenderProcessHost()->GetID());
   guest_web_contents_by_instance_id_.erase(it);
 
   // All the instance IDs that lie within [0, last_instance_id_removed_]
   // are invalid.
   // The remaining sparse invalid IDs are kept in |removed_instance_ids_| set.
   // The following code compacts the set by incrementing
   // |last_instance_id_removed_|.
   if (guest_instance_id == last_instance_id_removed_ + 1) {
     ++last_instance_id_removed_;
     // Compact.
     std::set<int>::iterator iter = removed_instance_ids_.begin();
     while (iter != removed_instance_ids_.end()) {
       int instance_id = *iter;
       // The sparse invalid IDs must not lie within
       // [0, last_instance_id_removed_]
       DCHECK(instance_id > last_instance_id_removed_);
       if (instance_id != last_instance_id_removed_ + 1)
         break;
       ++last_instance_id_removed_;
       removed_instance_ids_.erase(iter++);
     }
   } else {
     removed_instance_ids_.insert(guest_instance_id);
   }
 }
 
-void GuestViewManager::AddRenderProcessHostID(int render_process_host_id) {
-  render_process_host_id_multiset_.insert(render_process_host_id);
-}
-
 content::WebContents* GuestViewManager::GetGuestByInstanceID(
     int guest_instance_id,
     int embedder_render_process_id) {
   GuestInstanceMap::const_iterator it =
       guest_web_contents_by_instance_id_.find(guest_instance_id);
   if (it == guest_web_contents_by_instance_id_.end())
     return NULL;
   return it->second;
 }
 
@@ skipping 56 matching lines @@
       return false;
 
     return embedder_render_process_id ==
         guest->GetOpener()->embedder_web_contents()->GetRenderProcessHost()->
             GetID();
   }
 
   return embedder_render_process_id ==
       guest->embedder_web_contents()->GetRenderProcessHost()->GetID();
 }