Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/ssl/ssl_manager.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_MANAGER_H_
 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "chrome/browser/ssl/ssl_policy_backend.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 
 class LoadFromMemoryCacheDetails;
 class NavigationController;
 class NavigationEntry;
 class ProvisionalLoadDetails;
@@ skipping 36 matching lines @@
                                            int cert_status,
                                            int security_bits,
                                            int connection_status);
   static bool DeserializeSecurityInfo(const std::string& state,
                                       int* cert_id,
                                       int* cert_status,
                                       int* security_bits,
                                       int* connection_status);
 
   // Returns "<organization_name> [<country>]".
-  static std::wstring GetEVCertName(const net::X509Certificate& cert);
+  static string16 GetEVCertName(const net::X509Certificate& cert);
 
   // Construct an SSLManager for the specified tab.
   // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
   explicit SSLManager(NavigationController* controller);
   ~SSLManager();
 
   SSLPolicy* policy() { return policy_.get(); }
   SSLPolicyBackend* backend() { return &backend_; }
 
   // The navigation controller associated with this SSLManager.  The
@@ skipping 42 matching lines @@
   // for the security UI of this tab.
   NavigationController* controller_;
 
   // Handles registering notifications with the NotificationService.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLManager);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_MANAGER_H_