Origin Identifier Value Map.

chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/table_model_array_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
@@ skipping 90 matching lines @@
  private:
   AutoReset<CommandLine> command_line_;
 };
 
 TEST_F(TableModelArrayControllerTest, CheckTitles) {
   NSArray* titles = [[controller_.get() arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    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]);
 }
 
 TEST_F(TableModelArrayControllerTest, RemoveRows) {
   NSArrayController* controller = controller_.get();
   [controller setSelectionIndex:1];
   [controller remove:nil];
   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]);
 
   [controller setSelectionIndex:2];
   [controller remove:nil];
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\"\n"
+              @"    \"[*.]moose.org\"\n"
               @")",
               [titles description]);
 }
 
 TEST_F(TableModelArrayControllerTest, RemoveAll) {
   [controller_.get() removeAll:nil];
   EXPECT_EQ(0u, [[controller_.get() arrangedObjects] count]);
 }
 
 TEST_F(TableModelArrayControllerTest, AddException) {
   TestingProfile* profile = browser_helper_.profile();
   HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
   ContentSettingsPattern example_com =
       ContentSettingsPattern::FromString("[*.]example.com");
   map->SetContentSetting(example_com,
                          CONTENT_SETTINGS_TYPE_PLUGINS,
                          "c-blurp",
                          CONTENT_SETTING_BLOCK);
 
   NSArrayController* controller = controller_.get();
   NSArray* titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    FooPlugin,\n"
               @"    \"[*.]example.com\",\n"
               @"    BarPlugin,\n"
+              @"    \"[*.]moose.org\",\n"
               @"    \"[*.]example.com\",\n"
-              @"    \"[*.]moose.org\",\n"
               @"    BlurpPlugin,\n"
               @"    \"[*.]example.com\"\n"
               @")",
               [titles description]);
   NSMutableIndexSet* indexes = [NSMutableIndexSet indexSetWithIndex:1];
   [indexes addIndex:6];
   [controller setSelectionIndexes:indexes];
   [controller remove:nil];
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
-              @"    \"[*.]example.com\",\n"
-              @"    \"[*.]moose.org\"\n"
+              @"    \"[*.]moose.org\",\n"
+              @"    \"[*.]example.com\"\n"
               @")",
               [titles description]);
 }