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

chrome/browser/webdata/web_intents_table_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 314 matching lines @@
   s2.type = mime_image;
   ASSERT_EQ(URLPattern::PARSE_SUCCESS,
       s2.url_pattern.Parse(test_url.spec()));
   s2.user_date = 1;
   s2.suppression = 4;
   s2.service_url = test_service_url_2.spec();
   ASSERT_TRUE(IntentsTable()->SetDefaultService(s2));
 
   std::vector<DefaultWebIntentService> defaults;
   ASSERT_TRUE(IntentsTable()->GetAllDefaultServices(&defaults));
-  ASSERT_EQ(3U, defaults.size());
+  ASSERT_EQ(2U, defaults.size());
 
   ASSERT_TRUE(IntentsTable()->RemoveServiceDefaults(test_service_url));
 
   defaults.clear();
   ASSERT_TRUE(IntentsTable()->GetAllDefaultServices(&defaults));
   ASSERT_EQ(1U, defaults.size());
   EXPECT_EQ(test_service_url_2.spec(), defaults[0].service_url);
 }
 
+TEST_F(WebIntentsTableTest, OverwriteDefaults) {
+  DefaultWebIntentService default_service;
+  default_service.action = test_action;
+  default_service.type = mime_image;
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS,

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

Nuke the assert, it's unrelated to the test. We can clean up the rest of the
class later.

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

Done.

+            default_service.url_pattern.Parse(test_url.spec()));
+  default_service.user_date = 1;
+  default_service.suppression = 4;
+  default_service.service_url = "service_url";
+  ASSERT_TRUE(IntentsTable()->SetDefaultService(default_service));
+
+  default_service.user_date = 2;
+  default_service.service_url = "service_url2";
+  ASSERT_TRUE(IntentsTable()->SetDefaultService(default_service));
+
+  default_service.user_date = 3;
+  default_service.service_url = "service_url3";
+  ASSERT_TRUE(IntentsTable()->SetDefaultService(default_service));
+
+  std::vector<DefaultWebIntentService> defaults;
+  ASSERT_TRUE(IntentsTable()->GetAllDefaultServices(&defaults));
+  ASSERT_EQ(1U, defaults.size());
+  EXPECT_EQ("service_url3", defaults[0].service_url);
+}
+
 } // namespace