Back out r10487 too

chrome/browser/history/url_database.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/history/url_database.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/sqlite_utils.h"
-#include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
 using base::Time;
 
 namespace history {
 
 const char URLDatabase::kURLRowFields[] = HISTORY_URL_ROW_FIELDS;
 const int URLDatabase::kNumURLRowFields = 9;
 
 bool URLDatabase::URLEnumerator::GetNextURL(URLRow* r) {
@@ skipping 378 matching lines @@
   KeywordSearchTermVisit visit;
   while (statement->step() == SQLITE_ROW) {
     visit.term = statement->column_wstring(0);
     visit.time = Time::FromInternalValue(statement->column_int64(1));
     matches->push_back(visit);
   }
 }
 
 bool URLDatabase::MigrateFromVersion11ToVersion12() {
   URLRow about_row;
-  if (GetRowForURL(GURL(chrome::kAboutBlankURL), &about_row)) {
+  if (GetRowForURL(GURL("about:blank"), &about_row)) {
     about_row.set_favicon_id(0);
     return UpdateURLRow(about_row.id(), about_row);
   }
   return true;
 }
 
 bool URLDatabase::DropStarredIDFromURLs() {
   if (!DoesSqliteColumnExist(GetDB(), "urls", "starred_id", NULL))
     return true;  // urls is already updated, no need to continue.
 
@@ skipping 52 matching lines @@
 }
 
 void URLDatabase::CreateSupplimentaryURLIndices() {
   // Add a favicon index.  This is useful when we delete urls.
   sqlite3_exec(GetDB(), "CREATE INDEX urls_favicon_id_INDEX ON urls (favicon_id)",
                NULL, NULL, NULL);
 }
 
 }  // namespace history