Display content settings applying to the current otr session only.

chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

 // Copyright (c) 2010 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/cocoa/content_exceptions_window_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "base/ref_counted.h"
@@ skipping 39 matching lines @@
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
     TestingProfile* profile = browser_helper_.profile();
     settingsMap_ = new HostContentSettingsMap(profile);
   }
 
   ContentExceptionsWindowController* GetController(ContentSettingsType type) {
     id controller = [ContentExceptionsWindowController
         controllerForType:type
-        settingsMap:settingsMap_.get()];
+              settingsMap:settingsMap_.get()
+           otrSettingsMap:NULL];
     [controller showWindow:nil];
     return controller;
   }
 
   void ClickAdd(ContentExceptionsWindowController* controller) {
     [controller addException:nil];
     ProcessEvents();
   }
 
   void ClickRemove(ContentExceptionsWindowController* controller) {
@@ skipping 18 matching lines @@
 
  protected:
   BrowserTestHelper browser_helper_;
   scoped_refptr<HostContentSettingsMap> settingsMap_;
 };
 
 TEST_F(ContentExceptionsWindowControllerTest, Construction) {
   ContentExceptionsWindowController* controller =
       [ContentExceptionsWindowController
           controllerForType:CONTENT_SETTINGS_TYPE_PLUGINS
-                settingsMap:settingsMap_.get()];
+                settingsMap:settingsMap_.get()
+             otrSettingsMap:NULL];
   [controller showWindow:nil];
   [controller close];  // Should autorelease.
 }
 
 // Regression test for http://crbug.com/37137
 TEST_F(ContentExceptionsWindowControllerTest, AddRemove) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   HostContentSettingsMap::SettingsForOneType settings;
@@ skipping 121 matching lines @@
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_COOKIES,
                                       &settings);
   EXPECT_EQ(1u, settings.size());
   EXPECT_EQ(CONTENT_SETTING_ASK, settings[0].second);
 }
 
 
 }  // namespace