Switch to using WebIntentPickerModel, and bring picker closer to mocks.

chrome/browser/ui/cocoa/web_intent_bubble_controller.h

Index: chrome/browser/ui/cocoa/web_intent_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/web_intent_bubble_controller.h b/chrome/browser/ui/cocoa/web_intent_bubble_controller.h
index ba202fe2f0c7488b97e59ecf730076c444ff9129..e226fadc606d37c56287c8d50a534c981236d526 100644
--- a/chrome/browser/ui/cocoa/web_intent_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/web_intent_bubble_controller.h
@@ -13,18 +13,13 @@
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 
 class WebIntentPickerCocoa;
+class WebIntentPickerModel;
 
 // Controller for intent picker bubble. This bubble pops up whenever a web
 // page invokes ActivateIntent and lets the user choose which service should
 // be used to handle this action.
 @interface WebIntentBubbleController : BaseBubbleController {
  @private
-  // Images for all icons shown in bubble.
-  scoped_nsobject<NSPointerArray> iconImages_;
-
-  // URLs associated with the individual services.
-  scoped_nsobject<NSArray> serviceURLs_;
-
   // C++ <-> ObjectiveC bridge. Weak reference.
   WebIntentPickerCocoa* picker_;
 
@@ -37,15 +32,11 @@ class WebIntentPickerCocoa;
         parentWindow:(NSWindow*)parent
           anchoredAt:(NSPoint)point;
 
-// Replaces the |image| for service at |index|.
-- (void)replaceImageAtIndex:(size_t)index withImage:(NSImage*)image;
-
-// Set the service |urls| for all services.
-- (void)setServiceURLs:(NSArray*)urls;
-
 // Set the contents for inline disposition intents.
 - (void)setInlineDispositionTabContents:(TabContentsWrapper*)wrapper;
 
+- (void)performLayoutWithModel:(WebIntentPickerModel*)model;
+
 @end  // WebIntentBubbleController
 
 #endif  // CHROME_BROWSER_UI_COCOA_WEB_INTENT_BUBBLE_CONTROLLER_H_