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

chrome/browser/safe_browsing/safe_browsing_test.cc

Index: chrome/browser/safe_browsing/safe_browsing_test.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_test.cc	(revision 66118)
+++ chrome/browser/safe_browsing/safe_browsing_test.cc	(working copy)
@@ -289,6 +289,10 @@
     // 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
@@ -554,15 +558,6 @@
     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.
@@ -623,14 +618,11 @@
     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();
 }