Add test for showing confirmation dialog for unsecure signin

net/test/embedded_test_server/embedded_test_server.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/test/embedded_test_server/embedded_test_server.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 74 matching lines @@
 }  // namespace
 
 HttpListenSocket::HttpListenSocket(const SocketDescriptor socket_descriptor,
                                    StreamListenSocket::Delegate* delegate)
     : TCPListenSocket(socket_descriptor, delegate) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void HttpListenSocket::Listen() {
   DCHECK(thread_checker_.CalledOnValidThread());
+#if !defined(OS_POSIX)
+  // This method may be called after the IO thread is changed, thus we need to
+  // call |WatchSocket| again to make sure it listens on the current IO thread.
+  // Only needed for non POSIX platforms, since on POSIX platforms
+  // StreamListenSocket::Listen already calls WatchSocket inside the function.
+  WatchSocket(WAITING_ACCEPT);
+#endif
   TCPListenSocket::Listen();
 }
 
+void HttpListenSocket::ListenOnIOThread() {

[xiyuan, 2014/08/12 18:35:54]

This looks the same as HttpListenSocket::Listen. Is it needed?

[guohui, 2014/08/12 19:01:16]

Sorry this patch is broken =(

the #if block should only be added to ListenOnIOThread, not Listen. Fixed in the
patch 8.

+  DCHECK(thread_checker_.CalledOnValidThread());
+#if !defined(OS_POSIX)
+  // This method may be called after the IO thread is changed, thus we need to
+  // call |WatchSocket| again to make sure it listens on the current IO thread.
+  // Only needed for non POSIX platforms, since on POSIX platforms
+  // StreamListenSocket::Listen already calls WatchSocket inside the function.
+  WatchSocket(WAITING_ACCEPT);
+#endif
+  Listen();
+}
+
 HttpListenSocket::~HttpListenSocket() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void HttpListenSocket::DetachFromThread() {
   thread_checker_.DetachFromThread();
 }
 
 EmbeddedTestServer::EmbeddedTestServer()
     : port_(-1),
@@ skipping 83 matching lines @@
   if (result == OK) {
     base_url_ = GURL(std::string("http://") + address.ToString());
   } else {
     LOG(ERROR) << "GetLocalAddress failed: " << ErrorToString(result);
   }
 }
 
 void EmbeddedTestServer::ListenOnIOThread() {
   DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
   DCHECK(Started());
-  listen_socket_->Listen();
+  listen_socket_->ListenOnIOThread();
 }
 
 void EmbeddedTestServer::ShutdownOnIOThread() {
   DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
 
   listen_socket_.reset();
   STLDeleteContainerPairSecondPointers(connections_.begin(),
                                        connections_.end());
   connections_.clear();
 }
@@ skipping 115 matching lines @@
           FROM_HERE, closure, run_loop.QuitClosure())) {
     return false;
   }
   run_loop.Run();
 
   return true;
 }
 
 }  // namespace test_server
 }  // namespace net