Do not allow GuestViewManager to (re)use an instance ID that was already removed.

chrome/browser/guest_view/guest_view_base.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_base.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
@@ skipping 34 matching lines @@
     : guest_web_contents_(guest_web_contents),
       embedder_web_contents_(NULL),
       embedder_extension_id_(embedder_extension_id),
       embedder_render_process_id_(0),
       browser_context_(guest_web_contents->GetBrowserContext()),
       guest_instance_id_(guest_instance_id),
       view_instance_id_(guestview::kInstanceIDNone),
       weak_ptr_factory_(this) {
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
-  GuestViewManager::FromBrowserContext(browser_context_)->
-      AddGuest(guest_instance_id_, guest_web_contents);
+  DCHECK(GuestViewManager::FromBrowserContext(browser_context_)

[lazyboy, 2014/05/22 15:59:31]

Q: Do we need a CHECK here too?

[Fady Samuel, 2014/05/22 17:41:53]

If we have a CHECK inside AddGuest then why do we need a return value?

[lazyboy, 2014/05/22 18:34:45]

The return value was for test, I've moved the logic to a separate function and
testing that instead.
Changed back to return void.

+             ->AddGuest(guest_instance_id_, guest_web_contents));
 }
 
 // static
 GuestViewBase* GuestViewBase::Create(
     int guest_instance_id,
     WebContents* guest_web_contents,
     const std::string& embedder_extension_id,
     const std::string& view_type) {
   if (view_type == "webview") {
     return new WebViewGuest(guest_instance_id,
@@ skipping 165 matching lines @@
 
 void GuestViewBase::SendQueuedEvents() {
   if (!attached())
     return;
   while (!pending_events_.empty()) {
     linked_ptr<Event> event_ptr = pending_events_.front();
     pending_events_.pop_front();
     DispatchEvent(event_ptr.release());
   }
 }