Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei...

chrome/browser/toolbar_model.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/browser/toolbar_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ skipping 104 matching lines @@
   // should never be NULL.
   DCHECK(navigation_controller);
   NavigationEntry* entry = navigation_controller->GetActiveEntry();
   DCHECK(entry);
 
 
   const NavigationEntry::SSLStatus& ssl = entry->ssl();
   switch (ssl.security_style()) {
     case SECURITY_STYLE_AUTHENTICATED: {
       if (ssl.has_mixed_content()) {
-        SSLErrorInfo error_info =
-            SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
-                                      NULL, GURL::EmptyGURL());
+        SSLErrorInfo error_info = SSLErrorInfo::CreateError(
+            SSLErrorInfo::MIXED_CONTENTS, NULL, GURL());
         text->assign(error_info.short_description());
       } else {
         DCHECK(entry->url().has_host());
         text->assign(l10n_util::GetStringF(IDS_SECURE_CONNECTION,
                                            UTF8ToWide(entry->url().host())));
       }
       break;
     }
     case SECURITY_STYLE_AUTHENTICATION_BROKEN: {
       CreateErrorText(entry, text);
@@ skipping 45 matching lines @@
 
 void ToolbarModel::CreateErrorText(NavigationEntry* entry, std::wstring* text) {
   const NavigationEntry::SSLStatus& ssl = entry->ssl();
   std::vector<SSLErrorInfo> errors;
   SSLErrorInfo::GetErrorsForCertStatus(ssl.cert_id(),
                                        ssl.cert_status(),
                                        entry->url(),
                                        &errors);
   if (ssl.has_mixed_content()) {
     errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
-                                               NULL, GURL::EmptyGURL()));
+                                               NULL, GURL()));
   }
   if (ssl.has_unsafe_content()) {
     errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::UNSAFE_CONTENTS,
-                                               NULL, GURL::EmptyGURL()));
+                                               NULL, GURL()));
   }
 
   int error_count = static_cast<int>(errors.size());
   if (error_count == 0) {
     text->assign(L"");
   } else if (error_count == 1) {
     text->assign(errors[0].short_description());
   } else {
     // Multiple errors.
     text->assign(l10n_util::GetString(IDS_SEVERAL_SSL_ERRORS));
     text->append(L"\n");
     for (int i = 0; i < error_count; ++i) {
       text->append(errors[i].short_description());
       if (i != error_count - 1)
         text->append(L"\n");
     }
   }
 }