Reland r81454 (sync non-frontend datatype controllers) with longer timeouts.

chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
index 8fc2576c3812cd8e69fc0a00eef1a7b261f678f4..602e58219c15a696e2046050d1475357869fe24f 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
@@ -188,7 +188,7 @@ class NonFrontendDataTypeControllerTest : public testing::Test {
        NewRunnableFunction(&NonFrontendDataTypeControllerTest::SignalDone,
                            &done, &signaled_));
     done.TimedWait(base::TimeDelta::FromMilliseconds(
-        TestTimeouts::action_timeout_ms()));
+        TestTimeouts::action_max_timeout_ms()));
     if (!signaled_) {
       ADD_FAILURE() << "Timed out waiting for DB thread to finish.";
     }