App list: Infrastructure now supports multiple custom launcher pages.

ui/app_list/test/app_list_test_view_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 "ui/app_list/test/app_list_test_view_delegate.h"
 
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate_observer.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace app_list {
@@ skipping 71 matching lines @@
 
 gfx::ImageSkia AppListTestViewDelegate::GetWindowIcon() {
   return gfx::ImageSkia();
 }
 
 #if defined(TOOLKIT_VIEWS)
 views::View* AppListTestViewDelegate::CreateStartPageWebView(
     const gfx::Size& size) {
   return NULL;
 }
-views::View* AppListTestViewDelegate::CreateCustomPageWebView(
+std::vector<views::View*> AppListTestViewDelegate::CreateCustomPageWebViews(
     const gfx::Size& size) {
-  return NULL;
+  return std::vector<views::View*>();
 }
 #endif
 
 bool AppListTestViewDelegate::IsSpeechRecognitionEnabled() {
   return false;
 }
 
 const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const {
   return users_;
 }
@@ skipping 12 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void AppListTestViewDelegate::RemoveObserver(
     AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace test
 }  // namespace app_list