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

chrome/browser/webdata/web_intents_table.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/webdata/web_intents_table.h"
 #include <string>
 
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 282 matching lines @@
   }
 
   return s.Succeeded();
 
 }
 
 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();
 }
 
 bool WebIntentsTable::RemoveDefaultService(
     const DefaultWebIntentService& default_service) {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM web_intents_defaults "
       "WHERE action = ? AND type = ? AND url_pattern = ?"));
   s.BindString16(0, default_service.action);
   s.BindString16(1, default_service.type);
   s.BindString(2, default_service.url_pattern.GetAsString());
 
   return s.Run();
 }
 
 bool WebIntentsTable::RemoveServiceDefaults(const GURL& service_url) {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM web_intents_defaults WHERE service_url = ?"));
   s.BindString(0, service_url.spec());
 
   return s.Run();
 }