Stop serializing WebString over IPC. The new rule is that only POD (plain ol...

chrome/browser/ssl/ssl_manager.cc

 // Copyright (c) 2006-2008 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/ssl/ssl_manager.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
 #include "webkit/glue/resource_type.h"
 
 #if defined(OS_WIN)
 // TODO(port): Port these files.
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/views/controls/link.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
@@ skipping 130 matching lines @@
   }
 
   if (entry->ssl().security_style() > style) {
     entry->ssl().set_security_style(style);
     return true;
   }
   return false;
 }
 
 // Delegate API method.
-void SSLManager::AddMessageToConsole(const WebConsoleMessage& message) {
+void SSLManager::AddMessageToConsole(const string16& message,
+                                     const WebConsoleMessage::Level& level) {
   TabContents* tab_contents = controller_->tab_contents();
   WebContents* web_contents = tab_contents->AsWebContents();
   if (!web_contents)
     return;
 
   web_contents->render_view_host()->AddMessageToConsole(
-      std::wstring(), message);
+      string16(), message, level);
 }
 
 // Delegate API method.
 void SSLManager::MarkHostAsBroken(const std::string& host) {
   ssl_host_state_->MarkHostAsBroken(host);
   DispatchSSLInternalStateChanged();
 }
 
 // Delegate API method.
 bool SSLManager::DidMarkHostAsBroken(const std::string& host) const {
@@ skipping 549 matching lines @@
   }
 
   if (ca_name) {
     // TODO(wtc): should we show the root CA's name instead?
     *ca_name = l10n_util::GetStringF(
         IDS_SECURE_CONNECTION_EV_CA,
         UTF8ToWide(cert.issuer().organization_names[0]));
   }
   return true;
 }