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

Unified Diff: content/browser/intents/intent_injector_unittest.cc

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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: content/browser/intents/intent_injector_unittest.cc
diff --git a/content/browser/intents/intent_injector_unittest.cc b/content/browser/intents/intent_injector_unittest.cc
deleted file mode 100644
index b32afc80f2e3b1fedd9aa0cfa34b906424070de8..0000000000000000000000000000000000000000
--- a/content/browser/intents/intent_injector_unittest.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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/bind.h"
-#include "base/memory/weak_ptr.h"
-#include "base/utf_string_conversions.h"
-#include "content/browser/intents/intent_injector.h"
-#include "content/browser/intents/internal_web_intents_dispatcher.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/browser/web_contents/test_web_contents.h"
-#include "content/common/intents_messages.h"
-#include "content/common/view_messages.h"
-#include "content/public/test/mock_render_process_host.h"
-#include "content/public/test/web_contents_tester.h"
-#include "webkit/glue/web_intent_data.h"
-#include "webkit/glue/web_intent_reply_data.h"
-
-namespace content {
-
-class IntentInjectorTest : public RenderViewHostImplTestHarness {
- public:
- IntentInjectorTest() {
- webkit_glue::WebIntentData intent(ASCIIToUTF16("action"),
- ASCIIToUTF16("type"),
- ASCIIToUTF16("unserialized_data"));
- // Will be destroyed when the IntentInjector shuts down.
- dispatcher_ = new InternalWebIntentsDispatcher(intent);
- }
-
- ~IntentInjectorTest() {}
-
- InternalWebIntentsDispatcher* dispatcher_;
-};
-
-TEST_F(IntentInjectorTest, TestDispatchLimitedToSameOrigin) {
- contents()->transition_cross_site = true;
- // Set up GetURL within the web_contents, and enable cross-site RVH
- // transitions.
- NavigateAndCommit(GURL("http://www.ddd.com/"));
-
- // Set up the injector, which will lock to the origin of GetURL.
- // The injector is a WebContentsObserver, destroyed when the
- // web_contents() is destroyed at the end of the test.
- IntentInjector* injector = new IntentInjector(web_contents());
- webkit_glue::WebIntentData intent(ASCIIToUTF16("action"),
- ASCIIToUTF16("type"),
- ASCIIToUTF16("unserialized_data"));
- injector->SetIntent(dispatcher_, intent);
-
- // Navigate to a same-origin page. The intent data should be sent.
- controller().LoadURL(GURL("http://www.ddd.com/page1"),
- Referrer(),
- PAGE_TRANSITION_TYPED,
- std::string());
- test_rvh()->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(
- rvh()->GetRoutingID(), true, base::TimeTicks(), base::TimeTicks()));
-
- ASSERT_FALSE(pending_rvh());
- injector->RenderViewCreated(rvh());
-
- EXPECT_FALSE(NULL == process()->sink().GetFirstMessageMatching(
- IntentsMsg_SetWebIntentData::ID));
- process()->sink().ClearMessages();
-
- // Intent data is sent to a different same-origin page.
- controller().LoadURL(GURL("http://www.ddd.com/page2"),
- Referrer(),
- PAGE_TRANSITION_TYPED,
- std::string());
- test_rvh()->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(
- rvh()->GetRoutingID(), true, base::TimeTicks(), base::TimeTicks()));
- ASSERT_FALSE(pending_rvh());
- injector->RenderViewCreated(rvh());
- EXPECT_FALSE(NULL == process()->sink().GetFirstMessageMatching(
- IntentsMsg_SetWebIntentData::ID));
- process()->sink().ClearMessages();
-
- controller().LoadURL(GURL("http://www.domain2.com/"),
- Referrer(),
- PAGE_TRANSITION_TYPED,
- std::string());
- ASSERT_TRUE(contents()->cross_navigation_pending());
- ASSERT_TRUE(pending_rvh());
- injector->RenderViewCreated(pending_test_rvh());
-
- // The injector is still operating on the WebContents with the ddd.com
- // initial page, so no intent data is sent to this new renderer.
- EXPECT_TRUE(NULL == process()->sink().GetFirstMessageMatching(
- IntentsMsg_SetWebIntentData::ID));
-}
-
-TEST_F(IntentInjectorTest, AbandonDeletes) {
- IntentInjector* injector = new IntentInjector(web_contents());
-
- base::WeakPtr<IntentInjector> weak_injector =
- injector->weak_factory_.GetWeakPtr();
- EXPECT_FALSE(weak_injector.get() == NULL);
- weak_injector->Abandon();
- EXPECT_TRUE(weak_injector.get() == NULL);
-
- // Sending a message will both auto-delete |dispatcher_| to clean up and
- // verify that messages don't get sent to the (now deleted) |injector|.
- dispatcher_->SendReply(
- webkit_glue::WebIntentReply(
- webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED,
- string16()));
-}
-
-} // namespace content
« no previous file with comments | « content/browser/intents/intent_injector.cc ('k') | content/browser/intents/internal_web_intents_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698