Origin Identifier Value Map.

chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm

Index: chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm b/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
index f7ce628dcdd3bbab64f58efb5238305daf14f430..ddb82edf925bd418a73b9baf65463095e4b15964 100644
--- a/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
@@ -108,8 +108,8 @@ TEST_F(TableModelArrayControllerTest, CheckTitles) {
               @"    FooPlugin,\n"
               @"    \"[*.]example.com\",\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\",\n"
-              @"    \"[*.]moose.org\"\n"
+              @"    \"[*.]moose.org\",\n"
+              @"    \"[*.]example.com\"\n"

[Bernhard Bauer, 2011/05/31 14:55:12]

So we now return the content settings rules in the order in which they were
added? That seems like it could get unclear pretty fast (and regress from the
current behavior). I think we're going to have to sort the rules before
returning them from the HostContentSettingsMap.

[markusheintz_, 2011/06/01 20:08:22]

You caught me being lazy in this CL. But I agree.
I extended the ContentSettingsPattern::Compare method and the <, > operator so
that I'm able to sort patterns.

content_settings::PrefProvider::GetAllContent... returns now a sorted list of
entries.

               @")",
               [titles description]);
 }
@@ -121,8 +121,8 @@ TEST_F(TableModelArrayControllerTest, RemoveRows) {
   NSArray* titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\",\n"
-              @"    \"[*.]moose.org\"\n"
+              @"    \"[*.]moose.org\",\n"
+              @"    \"[*.]example.com\"\n"
               @")",
               [titles description]);
 
@@ -131,7 +131,7 @@ TEST_F(TableModelArrayControllerTest, RemoveRows) {
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\"\n"
+              @"    \"[*.]moose.org\"\n"
               @")",
               [titles description]);
 }
@@ -157,8 +157,8 @@ TEST_F(TableModelArrayControllerTest, AddException) {
               @"    FooPlugin,\n"
               @"    \"[*.]example.com\",\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\",\n"
               @"    \"[*.]moose.org\",\n"
+              @"    \"[*.]example.com\",\n"
               @"    BlurpPlugin,\n"
               @"    \"[*.]example.com\"\n"
               @")",
@@ -170,8 +170,8 @@ TEST_F(TableModelArrayControllerTest, AddException) {
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\",\n"
-              @"    \"[*.]moose.org\"\n"
+              @"    \"[*.]moose.org\",\n"
+              @"    \"[*.]example.com\"\n"
               @")",
               [titles description]);
 }