Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Issue 8934011: Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 69781b5a8d010c69ba13d8575196a110bed3b696..f69452784e3aee5289cf2cc71514096e68be849c 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -19,7 +19,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/intents_host.h"
+#include "content/public/browser/web_intents_dispatcher.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/web_intent_service_data.h"
@@ -99,9 +99,9 @@ class WebIntentPickerFactoryMock : public WebIntentPickerFactory {
WebIntentPicker* picker_;
};
-class IntentsHostMock : public content::IntentsHost {
+class IntentsDispatcherMock : public content::WebIntentsDispatcher {
public:
- explicit IntentsHostMock(const webkit_glue::WebIntentData& intent)
+ explicit IntentsDispatcherMock(const webkit_glue::WebIntentData& intent)
: intent_(intent),
dispatched_(false) {}
@@ -179,8 +179,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {
webkit_glue::WebIntentData intent;
intent.action = ASCIIToUTF16("a");
intent.type = ASCIIToUTF16("b");
- IntentsHostMock* host = new IntentsHostMock(intent);
- controller->SetIntentsHost(host);
+ IntentsDispatcherMock* host = new IntentsDispatcherMock(intent);
+ controller->SetIntentsDispatcher(host);
OnServiceChosen(controller, 1);
ASSERT_EQ(2, browser()->tab_count());
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | content/browser/intents/intent_injector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698