Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/webdata/web_database_migration_unittest.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 <string>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 603 matching lines @@
     EXPECT_EQ(0, s2.ColumnInt(8));
     EXPECT_EQ(std::string("UTF-8"), s2.ColumnString(9));
     EXPECT_EQ(true, s2.ColumnBool(10));
     EXPECT_EQ(std::string("{google:baseSuggestURL}search?client=chrome&hl="
                           "{language}&q={searchTerms}"), s2.ColumnString(11));
     EXPECT_EQ(1, s2.ColumnInt(12));
     EXPECT_EQ(true, s2.ColumnBool(13));
     EXPECT_EQ(6245, s2.ColumnInt(14));
     EXPECT_EQ(false, s2.ColumnBool(15));
     EXPECT_EQ(std::string(), s2.ColumnString(16));
+    EXPECT_EQ(0, s2.ColumnInt(17));
+    EXPECT_EQ(std::string(), s2.ColumnString(18));
   }
 }
 
 // Makes sure date_modified is added correctly to autofill_profiles and
 // credit_cards.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion29ToCurrent) {
   // Initialize the database.
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_29.sql")));
 
   // Verify pre-conditions.  These are expectations for version 29 of the
@@ skipping 1292 matching lines @@
                                     &default_search_provider_id_backup));
     // Backup ID must be updated to match the old default search provider ID.
     EXPECT_EQ(default_search_provider_id, default_search_provider_id_backup);
 
     std::string default_search_provider_id_backup_signature;
     EXPECT_TRUE(meta_table.GetValue(KeywordTable::kBackupSignatureKey,
         &default_search_provider_id_backup_signature));
     EXPECT_FALSE(default_search_provider_id_backup_signature.empty());
   }
 }