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

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/gfx/color_utils.h"
@@ skipping 1851 matching lines @@
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
     factory->AddFactory(
         AudioRendererImpl::CreateFactory(audio_message_filter()));
   }
 
   // TODO(hclam): obtain the following parameters from |client|.
   webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory =
       new webkit_glue::MediaResourceLoaderBridgeFactory(
-          GURL::EmptyGURL(),  // referrer
-          "null",             // frame origin
-          "null",             // main_frame_origin
+          GURL(),  // referrer
+          "null",  // frame origin
+          "null",  // main_frame_origin
           base::GetCurrentProcId(),
           appcache::kNoHostId,
           routing_id());
 
   // A simple data source that keeps all data in memory.
   media::FilterFactory* simple_data_source_factory =
       webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(),
                                                    bridge_factory);
   // A sophisticated data source that does memory caching.
   media::FilterFactory* buffered_data_source_factory =
@@ skipping 939 matching lines @@
 }
 
 GURL RenderView::GetAlternateErrorPageURL(const GURL& failed_url,
                                           ErrorPageType error_type) {
   if (failed_url.SchemeIsSecure()) {
     // If the URL that failed was secure, then the embedding web page was not
     // expecting a network attacker to be able to manipulate its contents.  As
     // we fetch alternate error pages over HTTP, we would be allowing a network
     // attacker to manipulate the contents of the response if we tried to use
     // the link doctor here.
-    return GURL::EmptyGURL();
+    return GURL();
   }
 
   // Grab the base URL from the browser process.
   if (!alternate_error_page_url_.is_valid())
-    return GURL::EmptyGURL();
+    return GURL();
 
   // Strip query params from the failed URL.
   GURL::Replacements remove_params;
   remove_params.ClearUsername();
   remove_params.ClearPassword();
   remove_params.ClearQuery();
   remove_params.ClearRef();
   const GURL url_to_send = failed_url.ReplaceComponents(remove_params);
 
   // Construct the query params to send to link doctor.
@@ skipping 1078 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }