Enhance chrome.app.window API for shelf integration with pinning support

ash/test/test_shelf_delegate.cc

 // Copyright 2013 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 "ash/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 87 matching lines @@
 void TestShelfDelegate::OnShelfVisibilityStateChanged(WmShelf* shelf) {}
 
 ShelfID TestShelfDelegate::GetShelfIDForAppID(const std::string& app_id) {
   for (auto const& iter : shelf_id_to_app_id_map_) {
     if (iter.second == app_id)
       return iter.first;
   }
   return 0;
 }
 
+ShelfID TestShelfDelegate::GetShelfIDForAppIDAndLaunchID(
+    const std::string& app_id,
+    const std::string& /* launch_id */) {
+  for (auto const& iter : shelf_id_to_app_id_map_) {
+    if (iter.second == app_id)
+      return iter.first;
+  }
+  return 0;

[stevenjb, 2016/08/30 16:12:51]

Instead of copy/pasting identical code, just return GetShelfIDForAppID(app_id).
 

[Andra Paraschiv, 2016/08/31 10:57:18]

Done.

+}
+
 bool TestShelfDelegate::HasShelfIDToAppIDMapping(ShelfID id) const {
   return shelf_id_to_app_id_map_.find(id) != shelf_id_to_app_id_map_.end();
 }
 
 const std::string& TestShelfDelegate::GetAppIDForShelfID(ShelfID id) {
   DCHECK_GT(shelf_id_to_app_id_map_.count(id), 0u);
   return shelf_id_to_app_id_map_[id];
 }
 
 void TestShelfDelegate::PinAppWithID(const std::string& app_id) {
@@ skipping 12 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash