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

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 28 matching lines @@
 // using supplied icon, title, and text, run through a template which contains
 // the standard formatting for notifications.
 static string16 CreateDataUrl(const GURL& icon_url, const string16& title,
     const string16& body) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NOTIFICATION_HTML));
 
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template. ID: " << IDR_NOTIFICATION_HTML;
-    return EmptyString16();
+    return string16();
   }
 
   std::vector<string16> subst;
   if (icon_url.is_valid())
     subst.push_back(UTF8ToUTF16(icon_url.spec()));
   else
-    subst.push_back(EmptyString16());
+    subst.push_back(string16());
 
   subst.push_back(UTF8ToUTF16(EscapeForHTML(UTF16ToUTF8(title))));
   subst.push_back(UTF8ToUTF16(EscapeForHTML(UTF16ToUTF8(body))));
 
   if (icon_url.is_valid()) {
     subst.push_back(ASCIIToUTF16("margin-left:56px;"));
   } else {
-    subst.push_back(EmptyString16());
+    subst.push_back(string16());
   }
 
   string16 format_string = ASCIIToUTF16("data:text/html;charset=utf-8,"
                                         + template_html.as_string());
   return ReplaceStringPlaceholders(format_string, subst, NULL);
 }
 
 // A task object which calls the renderer to inform the web page that the
 // permission request has completed.
 class NotificationPermissionCallbackTask : public Task {
@@ skipping 284 matching lines @@
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
     ExtensionsService* ext_service = profile_->GetExtensionsService();
     if (ext_service) {
       Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension)
         return ASCIIToWide(extension->name());
     }
   }
   return UTF8ToWide(origin.spec());
 }