intents: Remove the disposition enum in web intents model.

chrome/browser/ui/cocoa/web_intent_sheet_controller_unittest.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
@@ skipping 82 matching lines @@
   NSWindow* window_;  // Weak, owned by |controller_|.
 };
 
 TEST_F(WebIntentPickerSheetControllerTest, NoRows) {
   CheckWindow(/*row_count=*/0);
 }
 
 TEST_F(WebIntentPickerSheetControllerTest, PopulatedRows) {
   WebIntentPickerModel model;
   model.AddInstalledService(string16(), GURL("http://example.org/intent.html"),
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   model.AddInstalledService(string16(), GURL("http://example.com/intent.html"),
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
 
   [controller_ performLayoutWithModel:&model];
 
   CheckWindow(/*row_count=*/2);
 }
 
 TEST_F(WebIntentPickerSheetControllerTest, SuggestionView) {
   WebIntentPickerModel model;
 
   model.AddSuggestedExtension(string16(), string16(), 2.5);
@@ skipping 59 matching lines @@
 
   // Empty picker dialog has two elements, title and body.
   ASSERT_EQ(2U, [[empty_dialog subviews] count]);
 
   // Both title and body are NSTextFields.
   ASSERT_TRUE([[[empty_dialog subviews] objectAtIndex:0]
       isKindOfClass:[NSTextField class]]);
   ASSERT_TRUE([[[empty_dialog subviews] objectAtIndex:1]
       isKindOfClass:[NSTextField class]]);
 }