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

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

Issue 877613002: Added pairing with Spake SHA224 key exchange. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@brillo1
Patch Set: Thu Jan 29 23:44:10 PST 2015 Created 5 years, 11 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 3eee978cb297fa07f6ec5c136ddb3375169f325c..82ab79142154c3205ca4197882fbc81386036269 100644
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
@@ -60,14 +60,13 @@ const char kGCDResponse[] =
" }}]}";
const char kPrivetInfoResponse[] =
- "{"
- "\"x-privet-token\": \"sample\""
- "}";
-
-const char kPrivetPingResponse[] =
- "{"
- "\"response\": \"pong\""
- "}";
+ "{\"version\":\"3.0\","
+ "\"endpoints\":{\"httpsPort\": 443},"
+ "\"authentication\":{"
+ " \"mode\":[\"anonymous\",\"pairing\",\"cloud\"],"
+ " \"pairing\":[\"embeddedCode\"],"
+ " \"crypto\":[\"p224_spake2\"]"
+ "}}";
#if defined(ENABLE_MDNS)
@@ -289,12 +288,6 @@ IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, Session) {
kPrivetInfoResponse,
net::HTTP_OK,
net::URLRequestStatus::SUCCESS);
-
- url_fetcher_factory_.SetFakeResponse(GURL("http://1.2.3.4:9090/privet/ping"),
- kPrivetPingResponse,
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
-
EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "session.html"));
}
« no previous file with comments | « chrome/browser/extensions/api/gcd_private/gcd_private_api.cc ('k') | chrome/browser/local_discovery/privetv3_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698