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

chrome/browser/browser.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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/gfx/point.h"
@@ skipping 493 matching lines @@
   return l10n_util::GetStringFUTF16(string_id, title);
 #endif
 }
 
 // static
 void Browser::FormatTitleForDisplay(string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) !=
          std::wstring::npos) {
-    title->replace(match_index, 1, EmptyString16());
+    title->replace(match_index, 1, string16());
     current_index = match_index;
   }
 }
 
 bool Browser::ShouldShowDistributorLogo() const {
   // Don't show the distributor logo on app frames and app popups.
   return !(type_ & TYPE_APP);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 2111 matching lines @@
   // View-source should not be enabled if already in view-source mode or
   // the source is not viewable.
   command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
       active_entry && !active_entry->IsViewSourceMode() &&
       is_source_viewable);
 
   // Instead of using GetURL here, we use url() (which is the "real" url of the
   // page) from the NavigationEntry because its reflects their origin rather
   // than the display one (returned by GetURL) which may be different (like
   // having "view-source:" on the front).
-  GURL savable_url = (active_entry) ? active_entry->url() : GURL::EmptyGURL();
+  GURL savable_url = (active_entry) ? active_entry->url() : GURL();
 
   command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE,
       SavePackage::IsSavableURL(savable_url));
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU,
       SavePackage::IsSavableContents(current_tab->contents_mime_type()) &&
       SavePackage::IsSavableURL(savable_url));
 
   // Disable certain items if running DevTools
   command_updater_.UpdateCommandEnabled(IDC_RELOAD,
                                         CanReloadContents(current_tab));
@@ skipping 530 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }