Introduce WebKit::WebSecurityOrigin as a wrapper around...

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2009 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 "config.h"
 
 #include <string>
 #include <vector>
 
 #include "Chrome.h"
@@ skipping 17 matching lines @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebFrameClient.h"
 #include "webkit/api/public/WebPlugin.h"
 #include "webkit/api/public/WebPluginParams.h"
+#include "webkit/api/public/WebSecurityOrigin.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/src/WebDataSourceImpl.h"
 #include "webkit/api/src/WebPluginContainerImpl.h"
 #include "webkit/api/src/WebPluginLoadObserver.h"
 #include "webkit/api/src/WrappedResourceRequest.h"
 #include "webkit/api/src/WrappedResourceResponse.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_list.h"
@@ skipping 932 matching lines @@
 }
 
 void WebFrameLoaderClient::didDisplayInsecureContent() {
   if (webframe_->client())
     webframe_->client()->didDisplayInsecureContent(webframe_);
 }
 
 void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin* origin) {
   if (webframe_->client()) {
     webframe_->client()->didRunInsecureContent(webframe_,
-        webkit_glue::StringToWebString(origin->toString()));
+        webkit_glue::SecurityOriginToWebSecurityOrigin(origin));
   }
 }
 
 ResourceError WebFrameLoaderClient::blockedError(const WebCore::ResourceRequest&) {
   // FIXME
   return ResourceError();
 }
 
 ResourceError WebFrameLoaderClient::cancelledError(
     const ResourceRequest& request) {
@@ skipping 334 matching lines @@
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   if (webview->client())
     webview->client()->navigateBackForwardSoon(offset);
 }
 
 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver() {
   WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
       webframe_->frame()->loader()->activeDocumentLoader());
   return ds->releasePluginLoadObserver();
 }