intents: Remove the disposition enum in web intents model.

chrome/browser/ui/intents/web_intent_picker_model_unittest.cc

 // 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/utf_string_conversions.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 namespace {
 
 const string16 kTitle1(ASCIIToUTF16("Foo"));
 const string16 kTitle2(ASCIIToUTF16("Bar"));
 const string16 kTitle3(ASCIIToUTF16("Baz"));
 const string16 kTitle4(ASCIIToUTF16("Biff"));
 const string16 kTitle5(ASCIIToUTF16("Max"));
 const string16 kTitle6(ASCIIToUTF16("Lulz"));
 const GURL kUrl1("http://www.example.com/foo");
 const GURL kUrl2("http://www.example.com/bar");
 const GURL kUrl3("http://www.example.com/baz");
 const string16 kId1(ASCIIToUTF16("nhkckhebbbncbkefhcpcgepcgfaclehe"));
 const string16 kId2(ASCIIToUTF16("hcpcgepcgfaclehenhkckhebbbncbkef"));
 const string16 kId3(ASCIIToUTF16("aclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId4(ASCIIToUTF16("bclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId5(ASCIIToUTF16("cclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId6(ASCIIToUTF16("dclehenhkckhebbbncbkefhcpcgepcgf"));
-const WebIntentPickerModel::Disposition kWindowDisposition(
-    WebIntentPickerModel::DISPOSITION_WINDOW);
-const WebIntentPickerModel::Disposition kInlineDisposition(
-    WebIntentPickerModel::DISPOSITION_INLINE);
+const webkit_glue::WebIntentServiceData::Disposition kWindowDisposition(
+    webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
+const webkit_glue::WebIntentServiceData::Disposition kInlineDisposition(
+    webkit_glue::WebIntentServiceData::DISPOSITION_INLINE);
 
 }
 
 class WebIntentPickerModelObserverMock : public WebIntentPickerModelObserver {
  public:
   MOCK_METHOD1(OnModelChanged, void(WebIntentPickerModel* model));
   MOCK_METHOD2(OnFaviconChanged,
                void(WebIntentPickerModel* model, size_t index));
   MOCK_METHOD2(OnExtensionIconChanged,
                void(WebIntentPickerModel* model, const string16& extension_id));
@@ skipping 189 matching lines @@
   // Default status is that "waiting for suggestions".
   EXPECT_TRUE(model_.IsWaitingForSuggestions());
 
   // "waiting" status can be toggled manually.
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
   model_.SetWaitingForSuggestions(false);
   EXPECT_FALSE(model_.IsWaitingForSuggestions());
   model_.SetWaitingForSuggestions(true);
   EXPECT_TRUE(model_.IsWaitingForSuggestions());
 }