intents: Remove the disposition enum in web intents model.

chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.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.
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h"
 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h"
 #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));
   MOCK_METHOD1(OnExtensionLinkClicked, void(const std::string& id));
   MOCK_METHOD0(OnSuggestionsLinkClicked, void ());
   MOCK_METHOD0(OnPickerClosed, void());
   MOCK_METHOD0(OnChooseAnotherService, void());
   MOCK_METHOD0(OnClosing, void());
 };
 
@@ skipping 36 matching lines @@
 
   ignore_result(picker_.release());  // Closing |picker_| will destruct it.
 }
 
 IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
     DontCancelAfterServiceInvokation) {
   CreateBubble(chrome::GetActiveTabContents(browser()));
 
   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());
 
   picker_->OnServiceChosen(0);
   picker_->Close();
 
   ignore_result(picker_.release());  // Closing |picker_| will destruct it.
 }
 
 IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
     OnCancelledWillSignalClose) {
   CreatePicker();
   EXPECT_CALL(delegate_, OnPickerClosed());
   EXPECT_CALL(delegate_, OnClosing());
   picker_->OnCancelled();
 
   ignore_result(picker_.release());  // Closing |picker_| will destruct it.
 }