Add kApplicationIdKey for ShellSurface::GetApplicationId and SetApplicationId

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc

 // Copyright 2017 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/arc/accessibility/arc_accessibility_helper_bridge.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
@@ skipping 14 matching lines @@
   if (!window)
     return nullptr;
 
   exo::Surface* arc_surface = exo::Surface::AsSurface(window);
   if (!arc_surface)
     arc_surface = exo::ShellSurface::GetMainSurface(window);
   return arc_surface;
 }
 
 int32_t GetTaskId(aura::Window* window) {
-  const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window);
-  if (arc_app_id.empty())
+  const std::string* arc_app_id = exo::ShellSurface::GetApplicationId(window);
+  if (!arc_app_id)
     return kNoTaskId;
 
   int32_t task_id = kNoTaskId;
-  if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1)
+  if (sscanf(arc_app_id->c_str(), "org.chromium.arc.%d", &task_id) != 1)
     return kNoTaskId;
 
   return task_id;
 }
 
 void DispatchFocusChange(arc::mojom::AccessibilityNodeInfoData* node_data) {
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   if (!accessibility_manager)
     return;
@@ skipping 213 matching lines @@
       break;
     }
   }
 }
 
 void ArcAccessibilityHelperBridge::OnTaskSetActive(int32_t task_id) {
   current_task_id_ = task_id;
 }
 
 }  // namespace arc