| Index: net/android/network_change_notifier_android_unittest.cc
|
| diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
|
| index 6ab894cef64ba7255625e65c45ef2e947cc88e2a..3f5464dfa67f6ffc1d6c4b35e37013c5710547d3 100644
|
| --- a/net/android/network_change_notifier_android_unittest.cc
|
| +++ b/net/android/network_change_notifier_android_unittest.cc
|
| @@ -24,13 +24,9 @@ class NetworkChangeNotifierDelegateAndroidObserver
|
| NetworkChangeNotifierDelegateAndroidObserver() : notifications_count_(0) {}
|
|
|
| // NetworkChangeNotifierDelegateAndroid::Observer:
|
| - virtual void OnConnectionTypeChanged() OVERRIDE {
|
| - notifications_count_++;
|
| - }
|
| + virtual void OnConnectionTypeChanged() OVERRIDE { notifications_count_++; }
|
|
|
| - int notifications_count() const {
|
| - return notifications_count_;
|
| - }
|
| + int notifications_count() const { return notifications_count_; }
|
|
|
| private:
|
| int notifications_count_;
|
| @@ -47,9 +43,7 @@ class NetworkChangeNotifierObserver
|
| notifications_count_++;
|
| }
|
|
|
| - int notifications_count() const {
|
| - return notifications_count_;
|
| - }
|
| + int notifications_count() const { return notifications_count_; }
|
|
|
| private:
|
| int notifications_count_;
|
| @@ -65,7 +59,7 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test {
|
|
|
| void RunTest(
|
| const base::Callback<int(void)>& notifications_count_getter,
|
| - const base::Callback<ConnectionType(void)>& connection_type_getter) {
|
| + const base::Callback<ConnectionType(void)>& connection_type_getter) {
|
| EXPECT_EQ(0, notifications_count_getter.Run());
|
| EXPECT_EQ(NetworkChangeNotifier::CONNECTION_UNKNOWN,
|
| connection_type_getter.Run());
|
| @@ -190,24 +184,19 @@ class NetworkChangeNotifierAndroidTest
|
| // NetworkChangeNotifierAndroid should reflect that state.
|
| TEST_F(NetworkChangeNotifierAndroidTest,
|
| NotificationsSentToNetworkChangeNotifierAndroid) {
|
| - RunTest(
|
| - base::Bind(
|
| - &NetworkChangeNotifierObserver::notifications_count,
|
| - base::Unretained(&connection_type_observer_)),
|
| - base::Bind(
|
| - &NetworkChangeNotifierAndroid::GetCurrentConnectionType,
|
| - base::Unretained(¬ifier_)));
|
| + RunTest(base::Bind(&NetworkChangeNotifierObserver::notifications_count,
|
| + base::Unretained(&connection_type_observer_)),
|
| + base::Bind(&NetworkChangeNotifierAndroid::GetCurrentConnectionType,
|
| + base::Unretained(¬ifier_)));
|
| }
|
|
|
| // When a NetworkChangeNotifierAndroid's connection state changes, it should
|
| // notify all of its observers.
|
| TEST_F(NetworkChangeNotifierAndroidTest,
|
| NotificationsSentToClientsOfNetworkChangeNotifier) {
|
| - RunTest(
|
| - base::Bind(
|
| - &NetworkChangeNotifierObserver::notifications_count,
|
| - base::Unretained(&connection_type_observer_)),
|
| - base::Bind(&NetworkChangeNotifier::GetConnectionType));
|
| + RunTest(base::Bind(&NetworkChangeNotifierObserver::notifications_count,
|
| + base::Unretained(&connection_type_observer_)),
|
| + base::Bind(&NetworkChangeNotifier::GetConnectionType));
|
| // Check that *all* the observers are notified.
|
| EXPECT_EQ(connection_type_observer_.notifications_count(),
|
| other_connection_type_observer_.notifications_count());
|
|
|