Added more tests for IncognitoModeAvailability.

chrome/browser/ui/ash/launcher/launcher_context_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
 
 #include "ash/launcher/launcher_alignment_menu.h"
 #include "ash/launcher/launcher_types.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class ChromeLauncherController;
 
 namespace aura {
 class RootWindow;
 }
 
 namespace extensions {
 class ContextMenuMatcher;
 }
 
 // Context menu shown for a launcher item.
 class LauncherContextMenu : public ui::SimpleMenuModel,
                             public ui::SimpleMenuModel::Delegate {
  public:
+  enum MenuItem {

[sky, 2013/01/14 16:03:37]

I don't like making these public just for a test, use a friend instead.

[rustema, 2013/01/15 07:37:40]

Done.

+    MENU_OPEN_NEW,
+    MENU_CLOSE,
+    MENU_PIN,
+    LAUNCH_TYPE_PINNED_TAB,
+    LAUNCH_TYPE_REGULAR_TAB,
+    LAUNCH_TYPE_FULLSCREEN,
+    LAUNCH_TYPE_WINDOW,
+    MENU_AUTO_HIDE,
+    MENU_NEW_WINDOW,
+    MENU_NEW_INCOGNITO_WINDOW,
+    MENU_ALIGNMENT_MENU,
+    MENU_CHANGE_WALLPAPER,
+  };
   // |item| is NULL if the context menu is for the launcher (the user right
   // |clicked on an area with no icons).
   LauncherContextMenu(ChromeLauncherController* controller,
                       const ash::LauncherItem* item,
                       aura::RootWindow* root_window);
   // Creates a menu used as a desktop context menu on |root_window|.
   LauncherContextMenu(ChromeLauncherController* controller,
                       aura::RootWindow* root_window);
   virtual ~LauncherContextMenu();
 
   void Init();
 
   // ID of the item we're showing the context menu for.
   ash::LauncherID id() const { return item_.id; }
 
   // ui::SimpleMenuModel::Delegate overrides:
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
   virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
-  enum MenuItem {
-    MENU_OPEN_NEW,
-    MENU_CLOSE,
-    MENU_PIN,
-    LAUNCH_TYPE_PINNED_TAB,
-    LAUNCH_TYPE_REGULAR_TAB,
-    LAUNCH_TYPE_FULLSCREEN,
-    LAUNCH_TYPE_WINDOW,
-    MENU_AUTO_HIDE,
-    MENU_NEW_WINDOW,
-    MENU_NEW_INCOGNITO_WINDOW,
-    MENU_ALIGNMENT_MENU,
-    MENU_CHANGE_WALLPAPER,
-  };
-
   // Does |item_| represent a valid item? See description of constructor for
   // details on why it may not be valid.
   bool is_valid_item() const { return item_.id != 0; }
 
   ChromeLauncherController* controller_;
 
   ash::LauncherItem item_;
 
   ash::LauncherAlignmentMenu launcher_alignment_menu_;
 
   scoped_ptr<extensions::ContextMenuMatcher> extension_items_;
 
   aura::RootWindow* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_