HttpServerProperties - Don't persist if ConfirmAlternativeService is

HttpServerProperties - Don't persist if ConfirmAlternativeService is
called with the same origin (HostPortPair) more than once and if we
didn't change anything in  broken_alternative_services_ (in other words
the return value of IsAlternativeServiceBroken hasn't changed).

This change reduces the number of times ConfirmAlternativeService tries to
persist HttpServerProperties to disk (currently ~17% of persist calls
are due to ConfirmAlternativeService).

BUG=451256
R=rch@chromium.org

Committed: https://crrev.com/5b3bb8590cd76530932dd2eb47667a19c191cc2d
Cr-Commit-Position: refs/heads/master@{#333169}

[ramant (doing other things), 2015-06-05 19:50:30]

Patchset #1 (id:1) has been deleted

[Ryan Hamilton, 2015-06-05 20:29:43]

lgtm

[ramant (doing other things), 2015-06-05 21:47:53]

The CQ bit was checked by rtenneti@chromium.org

[commit-bot: I haz the power, 2015-06-05 21:49:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1142413004/20001

[commit-bot: I haz the power, 2015-06-05 21:56:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-05 21:56:42]

Failed to apply patch for net/http/http_server_properties_manager_unittest.cc:
While running git apply --index -3 -p1;
  error: patch failed: net/http/http_server_properties_manager_unittest.cc:526
  Falling back to three-way merge...
  Applied patch to 'net/http/http_server_properties_manager_unittest.cc' with
conflicts.
  U net/http/http_server_properties_manager_unittest.cc

Patch:       net/http/http_server_properties_manager_unittest.cc
Index: net/http/http_server_properties_manager_unittest.cc
diff --git a/net/http/http_server_properties_manager_unittest.cc
b/net/http/http_server_properties_manager_unittest.cc
index
be17d9a02c162f91663931d166a6d0b92020fa6a..31d06e81cf815347bd5f7cb93a45f4ee49a6c41e
100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -526,6 +526,52 @@ TEST_F(HttpServerPropertiesManagerTest,
GetAlternativeService) {
   EXPECT_EQ(NPN_SPDY_4, alternative_service.protocol);
 }
 
+TEST_F(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
+  ExpectPrefsUpdate();
+
+  HostPortPair spdy_server_mail("mail.google.com", 80);
+  EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
+  AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com", 443);
+
+  ExpectScheduleUpdatePrefsOnNetworkThread();
+  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
+                                                    alternative_service, 1.0);
+
+  EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
+      alternative_service));
+  EXPECT_FALSE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
+      alternative_service));
+
+  ExpectScheduleUpdatePrefsOnNetworkThread();
+ 
http_server_props_manager_->MarkAlternativeServiceBroken(alternative_service);
+  EXPECT_TRUE(http_server_props_manager_->IsAlternativeServiceBroken(
+      alternative_service));
+  EXPECT_TRUE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
+      alternative_service));
+
+  ExpectScheduleUpdatePrefsOnNetworkThread();
+  http_server_props_manager_->ConfirmAlternativeService(alternative_service);
+  EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
+      alternative_service));
+  EXPECT_FALSE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
+      alternative_service));
+  // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+  http_server_props_manager_->ConfirmAlternativeService(alternative_service);
+  EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
+      alternative_service));
+  EXPECT_FALSE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
+      alternative_service));
+
+  // Run the task.
+  base::RunLoop().RunUntilIdle();
+  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
+
+  EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
+      alternative_service));
+  EXPECT_FALSE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
+      alternative_service));
+}
+
 TEST_F(HttpServerPropertiesManagerTest, SupportsQuic) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();

[commit-bot: I haz the power, 2015-06-05 21:56:46]

The CQ bit was unchecked by commit-bot@chromium.org

[ramant (doing other things), 2015-06-05 22:17:28]

The CQ bit was checked by rtenneti@chromium.org

[ramant (doing other things), 2015-06-05 22:17:29]

The patchset sent to the CQ was uploaded after l-g-t-m from rch@chromium.org
Link to the patchset: https://codereview.chromium.org/1142413004/#ps40001
(title: "Rebase")

[commit-bot: I haz the power, 2015-06-05 22:19:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1142413004/40001

[commit-bot: I haz the power, 2015-06-05 23:14:21]

Committed patchset #2 (id:40001)

[commit-bot: I haz the power, 2015-06-05 23:15:13]

Patchset 2 (id:??) landed as
https://crrev.com/5b3bb8590cd76530932dd2eb47667a19c191cc2d
Cr-Commit-Position: refs/heads/master@{#333169}