Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
diff --git a/net/ssl/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc
index 45d5080..51c74bf 100644
--- a/net/ssl/server_bound_cert_service_unittest.cc
+++ b/net/ssl/server_bound_cert_service_unittest.cc
@@ -52,11 +52,12 @@
ServerBoundCertService::GetDomainForHost("google.com"));
EXPECT_EQ("google.com",
ServerBoundCertService::GetDomainForHost("www.google.com"));
- // NOTE(rch): we would like to segregate cookies and certificates for
- // *.appspot.com, but currently we can not do that becaues we want to
- // allow direct navigation to appspot.com.
- EXPECT_EQ("appspot.com",
+ EXPECT_EQ("foo.appspot.com",
ServerBoundCertService::GetDomainForHost("foo.appspot.com"));
+ EXPECT_EQ("bar.appspot.com",
+ ServerBoundCertService::GetDomainForHost("foo.bar.appspot.com"));
+ EXPECT_EQ("appspot.com",
+ ServerBoundCertService::GetDomainForHost("appspot.com"));
EXPECT_EQ("google.com",
ServerBoundCertService::GetDomainForHost("www.mail.google.com"));
EXPECT_EQ("goto",
@@ -351,7 +352,7 @@
sequenced_worker_pool_->FlushForTesting();
// Wait for reply from ServerBoundCertServiceWorker to be posted back to the
// ServerBoundCertService.
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
// Even though the original request was cancelled, the service will still
// store the result, it just doesn't call the callback.
@@ -384,7 +385,7 @@
sequenced_worker_pool_->FlushForTesting();
// Wait for reply from ServerBoundCertServiceWorker to be posted back to the
// ServerBoundCertService.
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
// Even though the original request was cancelled, the service will still
// store the result, it just doesn't call the callback.
@@ -419,7 +420,7 @@
// ServerBoundCertServiceWorker should not post anything back to the
// non-existant ServerBoundCertService, but run the loop just to be sure it
// doesn't.
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
// If we got here without crashing or a valgrind error, it worked.
}
@@ -433,7 +434,7 @@
sequenced_worker_pool_ = NULL;
// Ensure any shutdown code is processed.
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
// Make a request that will force synchronous completion.
std::string host("encrypted.google.com");