intents: Remove the disposition enum in web intents model.

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 1d61cd70bb6cf86072d8113e60138132fd5cecee..b5e258def17d076adccdc31a2a8248f76698d294 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -199,8 +199,6 @@ class IntentsDispatcherMock : public content::WebIntentsDispatcher {
 
 class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
  protected:
-  typedef WebIntentPickerModel::Disposition Disposition;
-
   WebIntentPickerControllerBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ -305,7 +303,9 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
     controller_->OnSendReturnMessage(reply_type);
   }
 
-  void OnServiceChosen(const GURL& url, Disposition disposition) {
+  void OnServiceChosen(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition) {
     controller_->OnServiceChosen(url, disposition);
   }
 
@@ -352,7 +352,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL2,
+                  webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             chrome::GetActiveWebContents(browser())->GetURL());
@@ -416,7 +417,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL1,
+                  webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());