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

Unified Diff: content/browser/net_info_browsertest.cc

Issue 1306423004: [NetInfo] Browser changes to support connection.downlinkMax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor browser test fix Created 5 years, 3 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/net_info_browsertest.cc
diff --git a/content/browser/net_info_browsertest.cc b/content/browser/net_info_browsertest.cc
index 67d939176a2c0e29520bf9a4af4ff83e5a0c1211..5701787b2b73f42faa60a3ffb24803a4bfc07d2e 100644
--- a/content/browser/net_info_browsertest.cc
+++ b/content/browser/net_info_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/command_line.h"
#include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/content_browser_test.h"
@@ -12,12 +13,19 @@
#include "net/base/network_change_notifier.h"
#include "net/base/network_change_notifier_factory.h"
+namespace content {
+
class NetInfoBrowserTest : public content::ContentBrowserTest {
protected:
void SetUpCommandLine(base::CommandLine* command_line) override {
// TODO(jkarlin): Once NetInfo is enabled on all platforms remove this
// switch.
command_line->AppendSwitch(switches::kEnableNetworkInformation);
+
+ // TODO(jkarlin): Remove this once downlinkMax is no longer
+ // experimental.
+ command_line->AppendSwitch(
+ switches::kEnableExperimentalWebPlatformFeatures);
}
void SetUp() override {
@@ -38,8 +46,11 @@ class NetInfoBrowserTest : public content::ContentBrowserTest {
}
static void SetConnectionType(
- net::NetworkChangeNotifier::ConnectionType type) {
- net::NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests(
+ net::NetworkChangeNotifier::ConnectionType type,
+ net::NetworkChangeNotifier::ConnectionSubtype subtype) {
+ net::NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChangeForTests(
+ net::NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
+ subtype),
type);
base::RunLoop().RunUntilIdle();
}
@@ -57,26 +68,46 @@ class NetInfoBrowserTest : public content::ContentBrowserTest {
ExecuteScriptAndExtractBool(shell()->web_contents(), script, &data));
return data;
}
+
+ double RunScriptExtractDouble(const std::string& script) {
+ double data = 0.0;
+ EXPECT_TRUE(base::StringToDouble(RunScriptExtractString(script), &data));
+ return data;
+ }
};
// Make sure that type changes in the browser make their way to
// navigator.connection.type.
IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, NetworkChangePlumbsToNavigator) {
NavigateToURL(shell(), content::GetTestUrl("", "net_info.html"));
- SetConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI);
+ SetConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI,
+ net::NetworkChangeNotifier::SUBTYPE_WIFI_N);
EXPECT_EQ("wifi", RunScriptExtractString("getType()"));
- SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
+ EXPECT_EQ(net::NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
+ net::NetworkChangeNotifier::SUBTYPE_WIFI_N),
+ RunScriptExtractDouble("getDownlinkMax()"));
+
+ SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET,
+ net::NetworkChangeNotifier::SUBTYPE_GIGABIT_ETHERNET);
EXPECT_EQ("ethernet", RunScriptExtractString("getType()"));
+ EXPECT_EQ(net::NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
+ net::NetworkChangeNotifier::SUBTYPE_GIGABIT_ETHERNET),
+ RunScriptExtractDouble("getDownlinkMax()"));
}
// Make sure that type changes in the browser make their way to
// navigator.isOnline.
IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, IsOnline) {
NavigateToURL(shell(), content::GetTestUrl("", "net_info.html"));
- SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
+ SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET,
+ net::NetworkChangeNotifier::SUBTYPE_GIGABIT_ETHERNET);
EXPECT_TRUE(RunScriptExtractBool("getOnLine()"));
- SetConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE);
+ SetConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE,
+ net::NetworkChangeNotifier::SUBTYPE_NONE);
EXPECT_FALSE(RunScriptExtractBool("getOnLine()"));
- SetConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI);
+ SetConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI,
+ net::NetworkChangeNotifier::SUBTYPE_WIFI_N);
EXPECT_TRUE(RunScriptExtractBool("getOnLine()"));
}
+
+} // namespace content
« no previous file with comments | « content/browser/net/browser_online_state_observer.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698