[Extensions OOPI] Update app window bindings for OOPI

chrome/browser/extensions/extension_tab_util.cc

 // Copyright (c) 2012 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/extensions/extension_tab_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 37 matching lines @@
 
 namespace {
 
 namespace keys = tabs_constants;
 
 WindowController* GetAppWindowController(const WebContents* contents) {
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   AppWindowRegistry* registry = AppWindowRegistry::Get(profile);
   if (!registry)
     return NULL;
-  AppWindow* app_window =
-      registry->GetAppWindowForRenderViewHost(contents->GetRenderViewHost());
+  AppWindow* app_window = registry->GetAppWindowForWebContents(contents);
   if (!app_window)
     return NULL;
   return WindowControllerList::GetInstance()->FindWindowById(
       app_window->session_id().id());
 }
 
 // |error_message| can optionally be passed in and will be set with an
 // appropriate message if the window cannot be found by id.
 Browser* GetBrowserInProfileWithId(Profile* profile,
                                    const int window_id,
@@ skipping 541 matching lines @@
 
   chrome::NavigateParams params(
       chrome::GetSingletonTabNavigateParams(browser, url_to_navigate));
   params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
   params.url = url_to_navigate;
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
   return true;
 }
 
 }  // namespace extensions