Update with new test suite, with shorter test data set.

chrome/browser/safe_browsing/safe_browsing_test.cc

 // Copyright (c) 2010 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.
 //
 // This test uses the safebrowsing test server published at
 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
 // protocol implemetation. Details of the safebrowsing testing flow is
 // documented at
 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
 //
@@ skipping 271 matching lines @@
   bool InitSafeBrowsingService() {
     safe_browsing_service_ =
         g_browser_process->resource_dispatcher_host()->safe_browsing_service();
     return safe_browsing_service_ != NULL;
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // Makes sure the auto update is not triggered. This test will force the
     // update when needed.
     command_line->AppendSwitch(switches::kSbDisableAutoUpdate);
+    // This test uses loopback. No need to use IPv6 especially it makes
+    // local requests slow on Windows trybot when ipv6 local address [::1]
+    // is not setup.
+    command_line->AppendSwitch(switches::kDisableIPv6);
 
     // In this test, we fetch SafeBrowsing data and Mac key from the same
     // server. Although in real production, they are served from different
     // servers.
     std::string url_prefix =
         StringPrintf("http://%s:%d/safebrowsing",
                      SafeBrowsingTestServer::Host(),
                      SafeBrowsingTestServer::Port());
     command_line->AppendSwitchASCII(switches::kSbInfoURLPrefix, url_prefix);
     command_line->AppendSwitchASCII(switches::kSbMacKeyURLPrefix, url_prefix);
@@ skipping 245 matching lines @@
   // Starts updates. After each update, the test will fetch a list of URLs with
   // expected results to verify with safebrowsing service. If there is no error,
   // the test moves on to the next step to get more update chunks.
   // This repeats till there is no update data.
   for (int step = 1;; step++) {
     // Every step should be a fresh start.
     SCOPED_TRACE(StringPrintf("step=%d", step));
     EXPECT_TRUE(is_database_ready());
     EXPECT_FALSE(is_update_scheduled());
 
-    // TODO(lzheng): Remove the following #if and #elif to enable the rest of
-    // the test once bot is restarted with change
-    // http://codereview.chromium.org/3750002.
-#if defined(OS_WIN)
-    break;
-#elif defined(OS_POSIX)
-    if (step > 2 ) break;
-#endif
-
     // Starts safebrowsing update on IO thread. Waits till scheduled
     // update finishes. Stops waiting after kMaxWaitSecPerStep if the update
     // could not finish.
     base::Time now = base::Time::Now();
     SetTestStep(step);
     safe_browsing_helper->ForceUpdate();
 
     do {
       // Periodically pull the status.
       safe_browsing_helper->WaitForStatusUpdate(
@@ skipping 40 matching lines @@
     // TODO(lzheng): We should verify the fetched database with local
     // database to make sure they match.
     EXPECT_EQ(URLRequestStatus::SUCCESS,
               safe_browsing_helper->FetchDBToVerify(server_host,
                                                     server_port,
                                                     step));
     EXPECT_GT(safe_browsing_helper->response_data().size(), 0U);
     last_step = step;
   }
 
-  // TODO(lzheng): Enable this check after safebrowsing server updated with
-  // the latest data in the next revision.
-
   // Verifies with server if test is done and waits till server responses.
-  //  EXPECT_EQ(URLRequestStatus::SUCCESS,
-  //            safe_browsing_helper->VerifyTestComplete(server_host,
-  //                                                     server_port,
-  //                                                     last_step));
-  //  EXPECT_EQ("yes", safe_browsing_helper->response_data());
+  EXPECT_EQ(URLRequestStatus::SUCCESS,
+            safe_browsing_helper->VerifyTestComplete(server_host,
+                                                     server_port,
+                                                     last_step));
+  EXPECT_EQ("yes", safe_browsing_helper->response_data());
   test_server.Stop();
 }