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

Unified Diff: chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc

Issue 8417043: Add webkit_glue namespace. Improve some variable and test names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 9 years, 2 months 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/intents/register_intent_handler_infobar_delegate_unittest.cc
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
index f13920bf5364fc1e00c95e332930b0bbb15c011a..cf647e8ba30a36d32c2531ba4b78640b17fcd7fe 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
@@ -19,7 +19,8 @@ namespace {
class MockWebIntentsRegistry : public WebIntentsRegistry {
public:
- MOCK_METHOD1(RegisterIntentProvider, void(const WebIntentServiceData&));
+ MOCK_METHOD1(RegisterIntentProvider,
+ void(const webkit_glue::WebIntentServiceData&));
};
ProfileKeyedService* BuildMockWebIntentsRegistry(Profile* profile) {
@@ -60,7 +61,7 @@ class RegisterIntentHandlerInfoBarDelegateTest
};
TEST_F(RegisterIntentHandlerInfoBarDelegateTest, Accept) {
- WebIntentServiceData service;
+ webkit_glue::WebIntentServiceData service;
service.service_url = GURL("google.com");
service.action = ASCIIToUTF16("http://webintents.org/share");
service.type = ASCIIToUTF16("text/url");
« no previous file with comments | « chrome/browser/intents/register_intent_handler_infobar_delegate.cc ('k') | chrome/browser/intents/web_intents_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698