Misc. cleanup found while mucking with search engines code:

chrome/browser/webdata/keyword_table.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 123 matching lines @@
   bool MigrateToVersion39AddSyncGUIDColumn();
   bool MigrateToVersion44AddDefaultSearchProviderBackup();
   bool MigrateToVersion45RemoveLogoIDAndAutogenerateColumns();
   bool MigrateToVersion47AddAlternateURLsColumn();
   bool MigrateToVersion48RemoveKeywordsBackup();
   bool MigrateToVersion49AddSearchTermsReplacementKeyColumn();
   bool MigrateToVersion52AddImageSearchAndPOSTSupport();
   bool MigrateToVersion53AddNewTabURLColumn();
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, GetTableContents);
-  FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, GetTableContentsOrdering);
-  FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, SanitizeURLs);
+  friend class KeywordTableTest;
   FRIEND_TEST_ALL_PREFIXES(WebDatabaseMigrationTest, MigrateVersion44ToCurrent);
 
   // NOTE: Since the table columns have changed in different versions, many
   // functions below take a |table_version| argument which dictates which
   // version number's column set to use.
 
   // Fills |data| with the data in |s|.  Returns false if we couldn't fill
   // |data| for some reason, e.g. |s| tried to set one of the fields to an
   // illegal value.
   static bool GetKeywordDataFromStatement(const sql::Statement& s,
@@ skipping 13 matching lines @@
                           std::string* result);
 
   // Migrates table |name| (which should be either "keywords" or
   // "keywords_backup") from version 44 to version 45.
   bool MigrateKeywordsTableForVersion45(const std::string& name);
 
   DISALLOW_COPY_AND_ASSIGN(KeywordTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_