Port some things in browser/{download,history}, minor things in common....

chrome/browser/history/url_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_URL_DATABASE_H__
 #define CHROME_BROWSER_HISTORY_URL_DATABASE_H__
 
 #include "base/basictypes.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/template_url.h"
@@ skipping 212 matching lines @@
       std::vector<KeywordSearchTermVisit>* matches);
 
   // Migration -----------------------------------------------------------------
 
   // Do to a bug we were setting the favicon of about:blank. This forces
   // about:blank to have no icon or title. Returns true on success, false if
   // the favicon couldn't be updated.
   bool MigrateFromVersion11ToVersion12();
 
  protected:
-  friend VisitDatabase;
+  friend class VisitDatabase;
 
   // See HISTORY_URL_ROW_FIELDS below.
   static const char kURLRowFields[];
 
   // The number of fiends in kURLRowFields. If callers need additional
   // fields, they can add their 0-based index to this value to get the index of
   // fields following kURLRowFields.
   static const int kNumURLRowFields;
 
   // Drops the starred_id column from urls, returning true on success. This does
@@ skipping 56 matching lines @@
 // string, it will save time doing string appends. If you have to build a SQL
 // string dynamically anyway, use the constant, it will save space.
 #define HISTORY_URL_ROW_FIELDS \
     " urls.id, urls.url, urls.title, urls.visit_count, urls.typed_count, " \
     "urls.last_visit_time, urls.hidden, urls.favicon_id "
 
 }  // history
 
 #endif  // CHROME_BROWSER_HISTORY_URL_DATABASE_H__