Tentative fix for crash in EncodingMenuController::IsItemChecked.

BUG=36180
TEST=unittest

Review URL: http://codereview.chromium.org/1591026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44033 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 3 deletions

diff --git a/chrome/browser/page_menu_model_unittest.cc b/chrome/browser/page_menu_model_unittest.cc
index 9c38b0b..98f1e3f 100644
--- a/chrome/browser/page_menu_model_unittest.cc
+++ b/chrome/browser/page_menu_model_unittest.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2009 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.
+// 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.
 
 #include "chrome/browser/page_menu_model.h"
 
 #include "base/logging.h"
+#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/menu_model_test.h"
 #include "grit/generated_resources.h"
@@ -54,3 +55,13 @@ TEST_F(PageMenuModelTest, Basics) {
   EXPECT_EQ(delegate_.execute_count_, 1);
   EXPECT_EQ(delegate_.enable_count_, 1);
 }
+
+class EncodingMenuModelTest : public BrowserWithTestWindowTest,
+                              public MenuModelTest {
+};
+
+TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
+  EncodingMenuModel model(browser());
+  ASSERT_EQ(NULL, browser()->GetSelectedTabContents());
+  EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
+}