Only show G+ promo for users logged into G+

chrome/browser/web_resource/promo_resource_service.cc

 // 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.
 
 #include "chrome/browser/web_resource/promo_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 139 matching lines @@
   return IsBuildTargeted(channel_, builds_targeted);
 }
 
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   UnpackLogoSignal(parsed_json);
   UnpackNotificationSignal(parsed_json);
   UnpackWebStoreSignal(parsed_json);
   UnpackNTPSignInPromoSignal(parsed_json);
 }
 
-void PromoResourceService::OnNewNotification(double start, double end) {
+void PromoResourceService::OnNotificationParsed(double start, double end) {
   ScheduleNotification(start, end);
 }
 
 void PromoResourceService::ScheduleNotification(double promo_start,
                                                 double promo_end) {
   if (promo_start > 0 && promo_end > 0) {
     int64 ms_until_start =
         static_cast<int64>((base::Time::FromDoubleT(
             promo_start) - base::Time::Now()).InMilliseconds());
     int64 ms_until_end =
@@ skipping 37 matching lines @@
   return local_state->GetInteger(prefs::kNTPPromoVersion);
 }
 
 std::string PromoResourceService::GetPromoLocale() {
   PrefService* local_state = g_browser_process->local_state();
   return local_state->GetString(prefs::kNTPPromoLocale);
 }
 
 void PromoResourceService::UnpackNotificationSignal(
     const DictionaryValue& parsed_json) {
-  NotificationPromo notification_promo(prefs_, this);
-  notification_promo.InitFromJson(parsed_json);
+  scoped_refptr<NotificationPromo> notification_promo =
+      NotificationPromo::Factory(profile_, this);
+  notification_promo->InitFromJson(parsed_json, false);
 }
 
 bool PromoResourceService::CanShowNotificationPromo(Profile* profile) {
-  NotificationPromo notification_promo(profile->GetPrefs(), NULL);
-  notification_promo.InitFromPrefs();
-  return notification_promo.CanShow();
+  scoped_refptr<NotificationPromo> notification_promo =
+      NotificationPromo::Factory(profile, NULL);
+  notification_promo->InitFromPrefs();
+  return notification_promo->CanShow();
 }
 
 void PromoResourceService::UnpackWebStoreSignal(
     const DictionaryValue& parsed_json) {
   DictionaryValue* topic_dict;
   ListValue* answer_list;
 
   bool is_webstore_active = false;
   bool signal_found = false;
   AppsPromo::PromoData promo_data;
@@ skipping 212 matching lines @@
   if (!prefs->HasPrefPath(prefs::kNTPSignInPromoGroup)) {
     prefs->SetInteger(prefs::kNTPSignInPromoGroup,
                       base::RandInt(1, kNTPSignInPromoNumberOfGroups));
   }
 
   // A response is not kept if the build wasn't targeted, so the only thing
   // required to check is the group this client has been tagged in.
   return prefs->GetInteger(prefs::kNTPSignInPromoGroupMax) >=
          prefs->GetInteger(prefs::kNTPSignInPromoGroup);
 }