Remove OnOptInChanged callback.

chrome/browser/chromeos/extensions/gfx_utils.cc

 // Copyright 2016 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/chromeos/extensions/gfx_utils.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 176 matching lines @@
   DCHECK(context);
   DCHECK(icon_out);
 
   Profile* profile = Profile::FromBrowserContext(context);
   // Only apply Chrome badge for the primary profile.
   if (!chromeos::ProfileHelper::IsPrimaryProfile(profile) ||
       !multi_user_util::IsProfileFromActiveUser(profile)) {
     return;
   }
 
-  arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();

[hidehiko, 2016/11/03 22:54:15]

Note: conceptually HasEquivalentInstalledArcApp should include this check, so we
do not need this.

-  // Only apply Chrome badge when ARC service is enabled.
-  if (!arc_auth_service ||

[khmel, 2016/11/03 23:09:17]

nit: you might no need #include "chrome/browser/chromeos/arc/arc_auth_service.h"

and probably

#include "chrome/browser/chromeos/arc/arc_support_host.h"

[hidehiko, 2016/11/04 00:04:56]

Done.

-      arc_auth_service->state() != arc::ArcAuthService::State::ACTIVE) {
-    return;
-  }
-
   const ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   if (!registry || !registry->GetInstalledExtension(extension_id))
     return;
 
   if (!HasEquivalentInstalledArcApp(context, extension_id))
     return;
 
   const gfx::ImageSkia* badge_image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_ARC_DUAL_ICON_BADGE);
   DCHECK(badge_image);
 
   gfx::ImageSkia resized_badge_image = *badge_image;
   if (badge_image->size() != icon_out->size()) {
     resized_badge_image = gfx::ImageSkiaOperations::CreateResizedImage(
         *badge_image, skia::ImageOperations::RESIZE_BEST, icon_out->size());
   }
   *icon_out = gfx::ImageSkiaOperations::CreateSuperimposedImage(
       *icon_out, resized_badge_image);
   return;
 }
 
 }  // namespace util
 }  // namespace extensions