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

Unified Diff: chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc

Issue 1103603002: Remove deprecated function gcdPrivate.establishSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Apr 22 22:29:12 PDT 2015 Created 5 years, 8 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/extensions/api/gcd_private/gcd_private_apitest.cc
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
index 82ab79142154c3205ca4197882fbc81386036269..931225adac3d0cabb37d1a96008a7354fb5f56d4 100644
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
@@ -59,6 +59,8 @@ const char kGCDResponse[] =
" \"maxRole\": \"owner\""
" }}]}";
+#if defined(ENABLE_MDNS)
+
const char kPrivetInfoResponse[] =
"{\"version\":\"3.0\","
"\"endpoints\":{\"httpsPort\": 443},"
@@ -68,8 +70,6 @@ const char kPrivetInfoResponse[] =
" \"crypto\":[\"p224_spake2\"]"
"}}";
-#if defined(ENABLE_MDNS)
-
const uint8 kAnnouncePacket[] = {
// Header
0x00, 0x00, // ID is zeroed out
@@ -283,16 +283,17 @@ IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, GetCloudList) {
EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "get_cloud_list.html"));
}
+#if defined(ENABLE_MDNS)
IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, Session) {
- url_fetcher_factory_.SetFakeResponse(GURL("http://1.2.3.4:9090/privet/info"),
+ test_service_discovery_client_->SimulateReceive(kAnnouncePacket,
+ sizeof(kAnnouncePacket));
+ url_fetcher_factory_.SetFakeResponse(GURL("http://1.2.3.4:8888/privet/info"),
kPrivetInfoResponse,
net::HTTP_OK,
net::URLRequestStatus::SUCCESS);
EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "session.html"));
}
-#if defined(ENABLE_MDNS)
-
IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, AddBefore) {
test_service_discovery_client_->SimulateReceive(kAnnouncePacket,
sizeof(kAnnouncePacket));
« no previous file with comments | « chrome/browser/extensions/api/gcd_private/gcd_private_api.cc ('k') | chrome/common/extensions/api/gcd_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698