Fixed logic for display of upgrade menu item.

chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/upgrade_detector.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/menu_model_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_io_thread_state.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 93 matching lines @@
 };
 
 TEST_F(WrenchMenuModelTest, Basics) {
   TestWrenchMenuModel model(this, browser());
   int itemCount = model.GetItemCount();
 
   // Verify it has items. The number varies by platform, so we don't check
   // the exact number.
   EXPECT_GT(itemCount, 10);
 
+  UpgradeDetector* detector = UpgradeDetector::GetInstance();
+  detector->NotifyUpgradeRecommended();
+  EXPECT_TRUE(detector->notify_upgrade());
+  if (browser_defaults::kShowUpgradeMenuItem)

[msw, 2015/04/23 22:06:41]

nit: EXPECT_EQ(browser_defaults::kShowUpgradeMenuItem,
model.IsCommandIdVisible(IDC_UPGRADE_DIALOG))

[Lei Zhang, 2015/04/23 22:07:45]

Maybe reduce the if/else to:

EXPECT_EQ(browser_defaults::kShowUpgradeMenuItem,
          model.IsCommandIdVisible(IDC_UPGRADE_DIALOG));

[Albert Bodenhamer, 2015/04/23 22:26:48]

Done.

[Albert Bodenhamer, 2015/04/23 22:26:48]

Done.

+    EXPECT_TRUE(model.IsCommandIdVisible(IDC_UPGRADE_DIALOG));
+  else
+    EXPECT_FALSE(model.IsCommandIdVisible(IDC_UPGRADE_DIALOG));
+
   // Execute a couple of the items and make sure it gets back to our delegate.
   // We can't use CountEnabledExecutable() here because the encoding menu's
   // delegate is internal, it doesn't use the one we pass in.
   // Note: The new menu has a spacing separator at the first slot.
   model.ActivatedAt(1);
   EXPECT_TRUE(model.IsEnabledAt(1));
   // Make sure to use the index that is not separator in all configurations.
   model.ActivatedAt(itemCount - 1);
   EXPECT_TRUE(model.IsEnabledAt(itemCount - 1));
 
@@ skipping 61 matching lines @@
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_WINDOWS1252));
 }