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

Unified Diff: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

Issue 10920084: don't display platform app resources in normal browser windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot to add Created 8 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
index b2f7973d3ca745c551c3661df83408508aa048bc..2a3d70edf856b9a5f80f3b19eefb71dd544d869c 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_test_message_listener.h"
+#include "chrome/browser/extensions/platform_app_launcher.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -60,8 +61,8 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
ASSERT_TRUE(extension);
- GURL page_url = extension->GetResourceURL("event_dispatch.html");
- ui_test_utils::NavigateToURL(browser(), page_url);
+ extensions::LaunchPlatformApp(
+ browser()->profile(), extension, NULL, FilePath());
EXPECT_TRUE(ready.WaitUntilSatisfied());
GetEventRouter()->TriggerMessageForTest(extension->id(), 1, "payload");
@@ -77,10 +78,10 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, ReceivesPush) {
ExtensionTestMessageListener ready("ready", true);
const extensions::Extension* extension =
- LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
+ LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
ASSERT_TRUE(extension);
- GURL page_url = extension->GetResourceURL("event_dispatch.html");
- ui_test_utils::NavigateToURL(browser(), page_url);
+ extensions::LaunchPlatformApp(
+ browser()->profile(), extension, NULL, FilePath());
EXPECT_TRUE(ready.WaitUntilSatisfied());
ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(
@@ -144,10 +145,10 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, GetChannelId) {
ExtensionTestMessageListener ready("ready", true);
const extensions::Extension* extension =
- LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
+ LoadExtension(test_data_dir_.AppendASCII("get_channel_id"));
ASSERT_TRUE(extension);
- GURL page_url = extension->GetResourceURL("get_channel_id.html");
- ui_test_utils::NavigateToURL(browser(), page_url);
+ extensions::LaunchPlatformApp(
+ browser()->profile(), extension, NULL, FilePath());
// Just loading the page will cause a getChannelId call, so we check
// for a callback. It should fail because there is no auth token.
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698