intents: Remove the disposition enum in web intents model.

chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm

Index: chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm b/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
index 2e17db584f2577c7b45e3ef5530e12ad5c440579..d64ad62dc7564dea942475d7a4a46aa730aa7c1a 100644
--- a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
@@ -11,13 +11,16 @@
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class MockIntentPickerDelegate : public WebIntentPickerDelegate {
  public:
   MockIntentPickerDelegate() {}
   virtual ~MockIntentPickerDelegate() {}
 
-  MOCK_METHOD2(OnServiceChosen, void(const GURL& url, Disposition disposition));
+  MOCK_METHOD2(OnServiceChosen, void(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition));
   MOCK_METHOD1(OnInlineDispositionWebContentsCreated,
       void(content::WebContents* web_contents));
   MOCK_METHOD1(OnExtensionInstallRequested, void(const std::string& id));
@@ -74,10 +77,10 @@ IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
 
   GURL url;
   model_.AddInstalledService(string16(), url,
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
 
   EXPECT_CALL(delegate_, OnServiceChosen(
-      url, WebIntentPickerModel::DISPOSITION_WINDOW));
+      url, webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW));
   EXPECT_CALL(delegate_, OnPickerClosed()).Times(0);
   EXPECT_CALL(delegate_, OnClosing());