introduce chrome/browser/common directory and move url_database(and its dependencies)

chrome/browser/common/url_database/url_database.cc

 // Copyright (c) 2012 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 "chrome/browser/common/url_database/url_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace history {
 
-const char URLDatabase::kURLRowFields[] = HISTORY_URL_ROW_FIELDS;
+const char URLDatabase::kURLRowFields[] = URL_DATABASE_ROW_FIELDS;
 const int URLDatabase::kNumURLRowFields = 9;
 
 URLDatabase::URLEnumeratorBase::URLEnumeratorBase()
     : initialized_(false) {
 }
 
 URLDatabase::URLEnumeratorBase::~URLEnumeratorBase() {
 }
 
 URLDatabase::URLEnumerator::URLEnumerator() {
 }
 
 URLDatabase::IconMappingEnumerator::IconMappingEnumerator() {
 }
 
 bool URLDatabase::URLEnumerator::GetNextURL(URLRow* r) {
   if (statement_.Step()) {
     FillURLRow(statement_, r);
     return true;
   }
   return false;
 }
 
 bool URLDatabase::IconMappingEnumerator::GetNextIconMapping(IconMapping* r) {
   if (!statement_.Step())
     return false;
 
   r->page_url = GURL(statement_.ColumnString(0));
-  r->icon_id =  statement_.ColumnInt64(1);
+  r->icon_id = statement_.ColumnInt64(1);
   return true;
 }
 
 URLDatabase::URLDatabase()
     : has_keyword_search_terms_(false) {
 }
 
 URLDatabase::~URLDatabase() {
 }
 
@@ skipping 21 matching lines @@
   i->last_visit_ = base::Time::FromInternalValue(s.ColumnInt64(5));
   i->hidden_ = s.ColumnInt(6) != 0;
 }
 
 bool URLDatabase::GetURLRow(URLID url_id, URLRow* info) {
   // TODO(brettw) We need check for empty URLs to handle the case where
   // there are old URLs in the database that are empty that got in before
   // we added any checks. We should eventually be able to remove it
   // when all inputs are using GURL (which prohibit empty input).
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
-      "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls WHERE id=?"));
+      "SELECT" URL_DATABASE_ROW_FIELDS "FROM urls WHERE id=?"));
   statement.BindInt64(0, url_id);
 
   if (statement.Step()) {
     FillURLRow(statement, info);
     return true;
   }
   return false;
 }
 
 bool URLDatabase::GetAllTypedUrls(URLRows* urls) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
-      "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls WHERE typed_count > 0"));
+      "SELECT" URL_DATABASE_ROW_FIELDS "FROM urls WHERE typed_count > 0"));
 
   while (statement.Step()) {
     URLRow info;
     FillURLRow(statement, &info);
     urls->push_back(info);
   }
   return true;
 }
 
 URLID URLDatabase::GetRowForURL(const GURL& url, history::URLRow* info) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
-      "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls WHERE url=?"));
+      "SELECT" URL_DATABASE_ROW_FIELDS "FROM urls WHERE url=?"));
   std::string url_string = GURLToDatabaseURL(url);
   statement.BindString(0, url_string);
 
   if (!statement.Step())
     return 0;  // no data
 
   if (info)
     FillURLRow(statement, info);
   return statement.ColumnInt64(0);
 }
@@ skipping 11 matching lines @@
   statement.BindInt(4, info.hidden() ? 1 : 0);
   statement.BindInt64(5, url_id);
 
   return statement.Run();
 }
 
 URLID URLDatabase::AddURLInternal(const history::URLRow& info,
                                   bool is_temporary) {
   // This function is used to insert into two different tables, so we have to
   // do some shuffling. Unfortinately, we can't use the macro
-  // HISTORY_URL_ROW_FIELDS because that specifies the table name which is
+  // URL_DATABASE_ROW_FIELDS because that specifies the table name which is
   // invalid in the insert syntax.
   #define ADDURL_COMMON_SUFFIX \
       " (url, title, visit_count, typed_count, "\
       "last_visit_time, hidden) "\
       "VALUES (?,?,?,?,?,?)"
   const char* statement_name;
   const char* statement_sql;
   if (is_temporary) {
     statement_name = "AddURLTemporary";
     statement_sql = "INSERT INTO temp_urls" ADDURL_COMMON_SUFFIX;
@@ skipping 108 matching lines @@
                                         size_t max_results,
                                         bool typed_only,
                                         URLRows* results) {
   // NOTE: this query originally sorted by starred as the second parameter. But
   // as bookmarks is no longer part of the db we no longer include the order
   // by clause.
   results->clear();
   const char* sql;
   int line;
   if (typed_only) {
-    sql = "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls "
+    sql = "SELECT" URL_DATABASE_ROW_FIELDS "FROM urls "
         "WHERE url >= ? AND url < ? AND hidden = 0 AND typed_count > 0 "
         "ORDER BY typed_count DESC, visit_count DESC, last_visit_time DESC "
         "LIMIT ?";
     line = __LINE__;
   } else {
-    sql = "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls "
+    sql = "SELECT" URL_DATABASE_ROW_FIELDS "FROM urls "
         "WHERE url >= ? AND url < ? AND hidden = 0 "
         "ORDER BY typed_count DESC, visit_count DESC, last_visit_time DESC "
         "LIMIT ?";
     line = __LINE__;
   }
   sql::Statement statement(
       GetDB().GetCachedStatement(sql::StatementID(__FILE__, line), sql));
 
   // We will find all strings between "prefix" and this string, which is prefix
   // followed by the maximum character size. Use 8-bit strings for everything
@@ skipping 275 matching lines @@
   return GetDB().Execute(sql.c_str());
 }
 
 bool URLDatabase::CreateMainURLIndex() {
   // Index over URLs so we can quickly look up based on URL.
   return GetDB().Execute(
       "CREATE INDEX IF NOT EXISTS urls_url_index ON urls (url)");
 }
 
 }  // namespace history