ObserverList::HasObserver now takes a const pointer.

ui/app_list/app_list_model_unittest.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 "ui/app_list/app_list_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 57 matching lines @@
 class AppListModelTest : public testing::Test {
  public:
   AppListModelTest() {}
   ~AppListModelTest() override {}
 
   // testing::Test overrides:
   void SetUp() override { model_.AddObserver(&observer_); }
   void TearDown() override { model_.RemoveObserver(&observer_); }
 
  protected:
-  bool ItemObservedByFolder(AppListFolderItem* folder,
-                            AppListItem* item) {
+  static bool ItemObservedByFolder(const AppListFolderItem* folder,

[Matt Giuca, 2014/11/03 23:22:00]

Note: I made this static as well (unrelated, but it should be static).

+                                   const AppListItem* item) {
     return item->observers_.HasObserver(folder);
   }
 
   std::string GetItemListContents(AppListItemList* item_list) {
     std::string s;
     for (size_t i = 0; i < item_list->item_count(); ++i) {
       if (i != 0)
         s += ",";
       s += item_list->item_at(i)->id();
     }
@@ skipping 410 matching lines @@
   model_.SetFoldersEnabled(false);
   ASSERT_FALSE(model_.FindFolderItem(folder_id));
   ASSERT_TRUE(model_.FindFolderItem(oem_folder_id));
   EXPECT_EQ("Item 0,Item 1,oem_folder", GetModelContents());
 
   // Ensure folder creation fails.
   EXPECT_EQ(std::string(), model_.MergeItems(item0->id(), item1->id()));
 }
 
 }  // namespace app_list