Fix WebContentsDelegate::ShouldCreateWebContents implementations.

chrome/browser/chromeos/first_run/drive_first_run_controller.cc

 // Copyright 2013 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/chromeos/first_run/drive_first_run_controller.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 147 matching lines @@
 
   void DidFailLoad(content::RenderFrameHost* render_frame_host,
                    const GURL& validated_url,
                    int error_code,
                    const base::string16& error_description,
                    bool was_ignored_by_handler) override;
 
   // content::WebContentsDelegate overrides:
   bool ShouldCreateWebContents(
       content::WebContents* web_contents,
+      content::SiteInstance* source_site_instance,
       int32_t route_id,
       int32_t main_frame_route_id,
       int32_t main_frame_widget_route_id,
       WindowContainerType window_container_type,
+      const GURL& opener_url,
       const std::string& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
       content::SessionStorageNamespace* session_storage_namespace) override;
 
   // content::NotificationObserver overrides:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
@@ skipping 91 matching lines @@
     bool was_ignored_by_handler) {
   if (!render_frame_host->GetParent()) {
     LOG(WARNING) << "Failed to load WebContents to enable offline mode.";
     OnOfflineInit(false,
                   DriveFirstRunController::OUTCOME_WEB_CONTENTS_LOAD_FAILED);
   }
 }
 
 bool DriveWebContentsManager::ShouldCreateWebContents(
     content::WebContents* web_contents,
+    content::SiteInstance* source_site_instance,
     int32_t route_id,
     int32_t main_frame_route_id,
     int32_t main_frame_widget_route_id,
     WindowContainerType window_container_type,
+    const GURL& opener_url,
     const std::string& frame_name,
     const GURL& target_url,
     const std::string& partition_id,
     content::SessionStorageNamespace* session_storage_namespace) {
   if (window_container_type == WINDOW_CONTAINER_TYPE_NORMAL)
     return true;
 
   // Check that the target URL is for the Drive app.
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile_)
           ->enabled_extensions().GetAppByURL(target_url);
   if (!extension || extension->id() != app_id_)
     return true;
 
   // The background contents creation is normally done in Browser, but
   // because we're using a detached WebContents, we need to do it ourselves.
   BackgroundContentsService* background_contents_service =
       BackgroundContentsServiceFactory::GetForProfile(profile_);
 
   // Prevent redirection if background contents already exists.
   if (background_contents_service->GetAppBackgroundContents(
       base::UTF8ToUTF16(app_id_))) {
     return false;
   }
+  // We are creating a new SiteInstance (and thus a new renderer process) here,
+  // so we must not use |route_id|, etc, which are IDs in a different process.
   BackgroundContents* contents =
       background_contents_service->CreateBackgroundContents(
-          content::SiteInstance::Create(profile_), route_id,
-          main_frame_route_id, main_frame_widget_route_id, profile_, frame_name,
+          content::SiteInstance::Create(profile_), MSG_ROUTING_NONE,
+          MSG_ROUTING_NONE, MSG_ROUTING_NONE, profile_, frame_name,
           base::ASCIIToUTF16(app_id_), partition_id, session_storage_namespace);
 
   contents->web_contents()->GetController().LoadURL(
       target_url,
       content::Referrer(),
       ui::PAGE_TRANSITION_LINK,
       std::string());
 
   // Return false as we already created the WebContents here.
   return false;
@@ skipping 144 matching lines @@
           base::UTF8ToUTF16(extension->name()), GURL(),
           message_center::NotifierId(message_center::NotifierId::APPLICATION,
                                      kDriveHostedAppId),
           data, new DriveOfflineNotificationDelegate(profile_)));
   notification->set_priority(message_center::LOW_PRIORITY);
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace chromeos