SkThreadPool: tweak two little things that have been annoying me

tests/OnceTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOnce.h"
-#include "SkRunnable.h"
 #include "SkThreadPool.h"
 #include "Test.h"
 #include "TestClassDef.h"
 
 DEF_SK_ONCE(add_five, int* x) {
     *x += 5;
 }
 
 DEF_TEST(SkOnce_Singlethreaded, r) {
     int x = 0;
@@ skipping 29 matching lines @@
     const int kTasks = 16, kThreads = 4;
 
     // Make a bunch of tasks that will race to be the first to add six to x.
     Racer racers[kTasks];
     int x = 0;
     for (int i = 0; i < kTasks; i++) {
         racers[i].ptr = &x;
     }
 
     // Let them race.
-    SkAutoTDelete<SkThreadPool> pool(new SkThreadPool(kThreads));
+    SkThreadPool pool(kThreads);
     for (int i = 0; i < kTasks; i++) {
-        pool->add(&racers[i]);
+        pool.add(&racers[i]);
     }
-    pool.free();  // Blocks until all threads are done.
+    pool.wait();
 
     // Only one should have done the +=.
     REPORTER_ASSERT(r, 6 == x);
 }