Fixed logic for display of upgrade menu item.

chrome/browser/upgrade_detector.h

 // 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.
 
 #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_H_
 #define CHROME_BROWSER_UPGRADE_DETECTOR_H_
 
 #include "base/timer/timer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "ui/base/idle/idle.h"
@@ skipping 114 matching lines @@
 
   void set_upgrade_notification_stage(UpgradeNotificationAnnoyanceLevel stage) {
     upgrade_notification_stage_ = stage;
   }
 
   void set_is_factory_reset_required(bool is_factory_reset_required) {
     is_factory_reset_required_ = is_factory_reset_required;
   }
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(WrenchMenuModelTest, Basics);

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

Why does this need to be a friend test? It looks like it just uses public API.

[Lei Zhang, 2015/04/23 22:08:22]

The methods are protected, not public.

[msw, 2015/04/23 22:11:28]

Ah, missed that, sorry!

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

Yep. Protected. There were a bunch of ways to go here. This seemed simplest, but
I'm never a fan of friend.

+
   // Initiates an Idle check. See IdleCallback below.
   void CheckIdle();
 
   // The callback for the IdleCheck. Tells us whether Chrome has received any
   // input events since the specified time.
   void IdleCallback(ui::IdleState state);
 
   // Triggers a global notification of the specified |type|.
   void TriggerNotification(chrome::NotificationType type);
 
@@ skipping 22 matching lines @@
   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_;
 
   // Whether we have waited long enough after detecting an upgrade (to see
   // is we should start nagging about upgrading).
   bool notify_upgrade_;
 
   DISALLOW_COPY_AND_ASSIGN(UpgradeDetector);
 };
 
 #endif  // CHROME_BROWSER_UPGRADE_DETECTOR_H_