Add the main frame routing ID to WebContentsDelegate, use it in BackgroundContents.

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 "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 145 matching lines @@
 
   virtual void DidFailLoad(content::RenderFrameHost* render_frame_host,
                            const GURL& validated_url,
                            int error_code,
                            const base::string16& error_description) override;
 
   // content::WebContentsDelegate overrides:
   virtual bool ShouldCreateWebContents(
       content::WebContents* web_contents,
       int route_id,
+      int main_frame_route_id,
       WindowContainerType window_container_type,
       const base::string16& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
       content::SessionStorageNamespace* session_storage_namespace) override;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
@@ skipping 93 matching lines @@
   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,
     int route_id,
+    int main_frame_route_id,
     WindowContainerType window_container_type,
     const base::string16& 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;
   }
   BackgroundContents* contents = background_contents_service
       ->CreateBackgroundContents(content::SiteInstance::Create(profile_),
                                  route_id,
+                                 main_frame_route_id,
                                  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,
@@ skipping 148 matching lines @@
           base::UTF8ToUTF16(extension->name()),
           message_center::NotifierId(message_center::NotifierId::APPLICATION,
                                      kDriveHostedAppId),
           data,
           new DriveOfflineNotificationDelegate(profile_)));
   notification->set_priority(message_center::LOW_PRIORITY);
   message_center::MessageCenter::Get()->AddNotification(notification.Pass());
 }
 
 }  // namespace chromeos