<webview>: Removed ResolveURL

extensions/browser/guest_view/web_view/web_view_guest.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 "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 862 matching lines @@
 content::JavaScriptDialogManager* WebViewGuest::GetJavaScriptDialogManager(
     WebContents* source) {
   return &javascript_dialog_helper_;
 }
 
 void WebViewGuest::NavigateGuest(const std::string& src,
                                  bool force_navigation) {
   if (src.empty())
     return;
 
-  GURL url = ResolveURL(src);
-
-  LoadURLWithParams(url, content::Referrer(),
+  // Resolve the |src| relative to the base URL of the owner.
+  GURL owner_base_url(GetOwnerSiteURL().GetWithEmptyPath());
+  LoadURLWithParams(owner_base_url.Resolve(src),
+                    content::Referrer(),
                     ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                     force_navigation);
 }
 
 bool WebViewGuest::HandleKeyboardShortcuts(
     const content::NativeWebKeyboardEvent& event) {
   // <webview> outside of Chrome Apps do not handle keyboard shortcuts.
   if (!in_extension())
     return false;
 
@@ skipping 348 matching lines @@
 
   web_view_permission_helper_->
       RequestPermission(WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW,
                         request_info,
                         base::Bind(&WebViewGuest::OnWebViewNewWindowResponse,
                                    weak_ptr_factory_.GetWeakPtr(),
                                    guest->guest_instance_id()),
                                    false /* allowed_by_default */);
 }
 
-GURL WebViewGuest::ResolveURL(const std::string& src) {
-  if (!in_extension())
-    return GURL(src);
-
-  GURL default_url(base::StringPrintf("%s://%s/",
-                                      kExtensionScheme,
-                                      owner_extension_id().c_str()));
-  return default_url.Resolve(src);
-}
-
 void WebViewGuest::OnWebViewNewWindowResponse(
     int new_window_instance_id,
     bool allow,
     const std::string& user_input) {
   auto guest =
       WebViewGuest::From(owner_web_contents()->GetRenderProcessHost()->GetID(),
                          new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }
 
 }  // namespace extensions