Fix for non-sticky defaults bug. Added a bunch of tests.

chrome/browser/webdata/web_intents_table.cc

Index: chrome/browser/webdata/web_intents_table.cc
diff --git a/chrome/browser/webdata/web_intents_table.cc b/chrome/browser/webdata/web_intents_table.cc
index 90243112e2be6be5d6af888d6ce11148eecaa703..99709d770aa232b8e809d97ee9860d46deaf3108 100644
--- a/chrome/browser/webdata/web_intents_table.cc
+++ b/chrome/browser/webdata/web_intents_table.cc
@@ -300,14 +300,16 @@ bool WebIntentsTable::SetDefaultService(
     const DefaultWebIntentService& default_service) {
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT OR REPLACE INTO web_intents_defaults "
-      "(action, type, url_pattern, user_date, suppression, service_url) "
-      "VALUES (?, ?, ?, ?, ?, ?)"));
+      "(action, type, url_pattern, user_date, suppression,"
+      " service_url, scheme) "
+      "VALUES (?, ?, ?, ?, ?, ?, ?)"));
   s.BindString16(0, default_service.action);
   s.BindString16(1, default_service.type);
   s.BindString(2, default_service.url_pattern.GetAsString());
   s.BindInt(3, default_service.user_date);
   s.BindInt64(4, default_service.suppression);
   s.BindString(5, default_service.service_url);
+  s.BindString16(6, default_service.scheme);
 
   return s.Run();
 }