Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/url_request/url_request_throttler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_throttler_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 509 matching lines @@
   no_opt_out_entry->UpdateWithResponse("www.nike.com", &wrong_adapter);
   ExpectEntryAllowsAllOnErrorIfOptedOut(no_opt_out_entry, false, request_);
 
   // A localhost entry should always be opted out.
   scoped_refptr<net::URLRequestThrottlerEntryInterface> localhost_entry =
       manager.RegisterRequestUrl(GURL("http://localhost/hello"));
   ExpectEntryAllowsAllOnErrorIfOptedOut(localhost_entry, true, request_);
 }
 
 TEST_F(URLRequestThrottlerManagerTest, ClearOnNetworkChange) {
-  for (int i = 0; i < 3; ++i) {
-    MockURLRequestThrottlerManager manager;
-    scoped_refptr<net::URLRequestThrottlerEntryInterface> entry_before =
-        manager.RegisterRequestUrl(GURL("http://www.example.com/"));
-    MockURLRequestThrottlerHeaderAdapter failure_adapter(503);
-    for (int j = 0; j < 10; ++j) {
-      // Host doesn't really matter in this scenario so we skip it.
-      entry_before->UpdateWithResponse("", &failure_adapter);
-    }
-    EXPECT_TRUE(entry_before->ShouldRejectRequest(request_));
+  MockURLRequestThrottlerManager manager;
+  scoped_refptr<net::URLRequestThrottlerEntryInterface> entry_before =
+      manager.RegisterRequestUrl(GURL("http://www.example.com/"));
+  MockURLRequestThrottlerHeaderAdapter failure_adapter(503);
+  for (int j = 0; j < 10; ++j) {
+    // Host doesn't really matter in this scenario so we skip it.
+    entry_before->UpdateWithResponse("", &failure_adapter);
+  }
+  EXPECT_TRUE(entry_before->ShouldRejectRequest(request_));
 
-    switch (i) {
-      case 0:
-        manager.OnIPAddressChanged();
-        break;
-      case 1:
-        manager.OnConnectionTypeChanged(
-            net::NetworkChangeNotifier::CONNECTION_UNKNOWN);
-        break;
-      case 2:
-        manager.OnConnectionTypeChanged(
-            net::NetworkChangeNotifier::CONNECTION_NONE);
-        break;
-      default:
-        FAIL();
-    }
+  manager.OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_UNKNOWN);
+  scoped_refptr<net::URLRequestThrottlerEntryInterface> first_entry_after =
+      manager.RegisterRequestUrl(GURL("http://www.example.com/"));
+  EXPECT_TRUE(first_entry_after->ShouldRejectRequest(request_));
 
-    scoped_refptr<net::URLRequestThrottlerEntryInterface> entry_after =
-        manager.RegisterRequestUrl(GURL("http://www.example.com/"));
-    EXPECT_FALSE(entry_after->ShouldRejectRequest(request_));
-  }
+  manager.OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_NONE);
+  scoped_refptr<net::URLRequestThrottlerEntryInterface> second_entry_after =
+      manager.RegisterRequestUrl(GURL("http://www.example.com/"));
+  EXPECT_FALSE(second_entry_after->ShouldRejectRequest(request_));
 }
 
 }  // namespace net