Back out r10487 too

chrome/browser/toolbar_model.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/cert_store.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
 #elif defined(OS_POSIX)
 // TODO(port): remove when tab_contents is ported
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
 ToolbarModel::ToolbarModel() : input_in_progress_(false) {
 }
 
 ToolbarModel::~ToolbarModel() {
 }
 
 // ToolbarModel Implementation.
 std::wstring ToolbarModel::GetText() {
-  GURL url(chrome::kAboutBlankURL);
+  static const GURL kAboutBlankURL("about:blank");
+  GURL url(kAboutBlankURL);
   std::wstring languages;  // Empty if we don't have a |navigation_controller|.
 
   NavigationController* navigation_controller = GetNavigationController();
   if (navigation_controller) {
     languages = navigation_controller->profile()->GetPrefs()->GetString(
                     prefs::kAcceptLanguages);
     NavigationEntry* entry = navigation_controller->GetActiveEntry();
     // We may not have a navigation entry yet
     if (!navigation_controller->active_contents()->ShouldDisplayURL()) {
       // Explicitly hide the URL for this tab.
@@ skipping 176 matching lines @@
     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");
     }
   }
 }