Fixed logic for display of upgrade menu item.

chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
index 8801cc6c7bbf1a11a78b5036545830c38f8e1844..bbe552ce8abff34fa7dc7135030c1ba6469e46c1 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
@@ -5,6 +5,7 @@
 #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"
@@ -12,6 +13,7 @@
 #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"
@@ -125,6 +127,14 @@ TEST_F(WrenchMenuModelTest, Basics) {
   // 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.