Introduce incognito preference settings.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
@@ skipping 66 matching lines @@
  public:
   BrowserTestHelper browser_helper_;
   BrowserWindowController* controller_;
 };
 
 TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) {
   PrefService* prefs = browser_helper_.profile()->GetPrefs();
   ASSERT_TRUE(prefs != NULL);
 
   // Check to make sure there is no existing pref for window placement.
-  ASSERT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) == NULL);
+  const DictionaryValue* browser_window_placement =
+      prefs->GetDictionary(prefs::kBrowserWindowPlacement);
+  ASSERT_TRUE(browser_window_placement);
+  EXPECT_TRUE(browser_window_placement->empty());
 
   // Ask the window to save its position, then check that a preference
   // exists.  We're technically passing in a pointer to the user prefs
   // and not the local state prefs, but a PrefService* is a
   // PrefService*, and this is a unittest.
   [controller_ saveWindowPositionToPrefs:prefs];
-  EXPECT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) != NULL);
+  browser_window_placement =
+      prefs->GetDictionary(prefs::kBrowserWindowPlacement);
+  ASSERT_TRUE(browser_window_placement);
+  EXPECT_FALSE(browser_window_placement->empty());
 }
 
 TEST_F(BrowserWindowControllerTest, TestFullScreenWindow) {
   // Confirm that |-createFullscreenWindow| doesn't return nil.
   // See BrowserWindowFullScreenControllerTest for more fullscreen tests.
   EXPECT_TRUE([controller_ createFullscreenWindow]);
 }
 
 TEST_F(BrowserWindowControllerTest, TestNormal) {
   // Force the bookmark bar to be shown.
@@ skipping 553 matching lines @@
   fullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return fullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */