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

chrome/browser/intents/web_intents_registry.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/intents/web_intents_registry.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 270 matching lines @@
       continue;
     }
     const Extension* extension = ExtensionForURL(iter->service_url);
     if (extension != NULL &&
         !extension_service_->IsExtensionEnabled(extension->id())) {
       continue;
     }
 
     // Found a match. If it is better than default_service, use it.
     // Currently the metric is that if the new value is user-set,
     // prefer it. If the new value has a more specific pattern, prefer it.

[Steve McKay, 2012/09/14 18:57:00]

Update the comment here to reflect the additional condition.

[Greg Billock, 2012/09/14 19:12:28]

Done.

     if (default_service.user_date <= 0 && iter->user_date >= 0) {
       default_service = *iter;
     } else if (default_service.url_pattern.match_all_urls() &&
              !iter->url_pattern.match_all_urls()) {
       default_service = *iter;
     } else if (iter->url_pattern < default_service.url_pattern) {
       default_service = *iter;
+    } else if (default_service.user_date < iter->user_date) {
+      default_service = *iter;
     }
   }
 
   // TODO(hshi): Temporary workaround for http://crbug.com/134197.
   // If no user-set default service is found, use built-in QuickOffice Viewer as
   // default for MS office files. Remove this once full defaults is in place.
   if (default_service.user_date <= 0) {
     for (size_t i = 0; i < sizeof(kQuickOfficeViewerMimeType) / sizeof(char*);
          ++i) {
       DefaultWebIntentService qoviewer_service;
@@ skipping 187 matching lines @@
 void WebIntentsRegistry::ReleaseQuery(QueryAdapter* query) {
   QueryVector::iterator it = std::find(
       pending_queries_.begin(), pending_queries_.end(), query);
   if (it != pending_queries_.end()) {
     pending_queries_.erase(it);
     delete query;
   } else {
     NOTREACHED();
   }
 }