Consolidate two IsArcWindow functions to reduce code duplication

chrome/browser/memory/tab_manager_delegate_chromeos.cc

 // Copyright 2015 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/memory/tab_manager_delegate_chromeos.h"
 
 #include <math.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 19 matching lines @@
 #include "chrome/browser/memory/memory_kills_monitor.h"
 #include "chrome/browser/memory/tab_stats.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_features.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
+#include "components/arc/arc_util.h"
 #include "components/device_event_log/device_event_log.h"
-#include "components/exo/shell_surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/zygote_host_linux.h"
-#include "ui/aura/window.h"
 #include "ui/wm/public/activation_client.h"
 
 using base::ProcessHandle;
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 
 namespace memory {
 namespace {
 
-const char kExoShellSurfaceWindowName[] = "ExoShellSurface";
-const char kArcProcessNamePrefix[] = "org.chromium.arc.";
-
 // When switching to a new tab the tab's renderer's OOM score needs to be
 // updated to reflect its front-most status and protect it from discard.
 // However, doing this immediately might slow down tab switch time, so wait
 // a little while before doing the adjustment.
 const int kFocusedProcessScoreAdjustIntervalMs = 500;
 
 aura::client::ActivationClient* GetActivationClient() {
   if (!ash::Shell::HasInstance())
     return nullptr;
   return aura::client::GetActivationClient(ash::Shell::GetPrimaryRootWindow());
 }
 
-// Checks if a window renders ARC apps.
-bool IsArcWindow(aura::Window* window) {
-  if (!window || window->GetName() != kExoShellSurfaceWindowName)
-    return false;
-  std::string application_id = exo::ShellSurface::GetApplicationId(window);
-  return base::StartsWith(application_id, kArcProcessNamePrefix,
-                          base::CompareCase::SENSITIVE);
-}
-
 bool IsArcMemoryManagementEnabled() {
   return base::FeatureList::IsEnabled(features::kArcMemoryManagement);
 }
 
 void OnSetOomScoreAdj(bool success, const std::string& output) {
   VLOG(2) << "OnSetOomScoreAdj " << success << " " << output;
   if (!success)
     LOG(ERROR) << "Set OOM score error: " << output;
   else if (!output.empty())
     LOG(WARNING) << "Set OOM score: " << output;
@@ skipping 240 matching lines @@
     return;
 
   base::ProcessHandle pid = contents->GetRenderProcessHost()->GetHandle();
   AdjustFocusedTabScore(pid);
 }
 
 void TabManagerDelegate::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
-  if (IsArcWindow(gained_active)) {
+  if (arc::IsArcAppWindow(gained_active)) {
     // Currently there is no way to know which app is displayed in the ARC
     // window, so schedule an early adjustment for all processes to reflect
     // the change.
     // Put a dummy FocusedProcess with nspid = kInvalidArcAppNspid for now to
     // indicate the focused process is an arc app.
     // TODO(cylee): Fix it when we have nspid info in ARC windows.
     focused_process_->SetArcAppNspid(FocusedProcess::kInvalidArcAppNspid);
     // If the timer is already running (possibly for a tab), it'll be reset
     // here.
     focus_process_score_adjust_timer_.Start(
         FROM_HERE,
         TimeDelta::FromMilliseconds(kFocusedProcessScoreAdjustIntervalMs),
         this, &TabManagerDelegate::ScheduleEarlyOomPrioritiesAdjustment);
   }
-  if (IsArcWindow(lost_active)) {
+  if (arc::IsArcAppWindow(lost_active)) {
     // Do not bother adjusting OOM score if the ARC window is deactivated
     // shortly.
     if (focused_process_->ResetIfIsArcApp() &&
         focus_process_score_adjust_timer_.IsRunning())
       focus_process_score_adjust_timer_.Stop();
   }
 }
 
 void TabManagerDelegate::ScheduleEarlyOomPrioritiesAdjustment() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 403 matching lines @@
     priority += priority_increment;
   }
 
   if (oom_scores_to_change.size()) {
     GetDebugDaemonClient()->SetOomScoreAdj(
         oom_scores_to_change, base::Bind(&OnSetOomScoreAdj));
   }
 }
 
 }  // namespace memory