FBTF: Clean up task.h in x11_util.h and header usage in some delegates.

chrome_frame/test/perf/chrome_frame_perftest.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.
 #include "chrome_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
 
 #include "chrome_tab.h"  // Generated from chrome_tab.idl.
 
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_consumer_win.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/trace_event_win.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/ui/ui_test.h"
 
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSilverlightControlKey[] =
@@ skipping 1302 matching lines @@
   // Print results
   std::string times;
   for (int i = 0; i < kNumCycles; ++i) {
     ASSERT_TRUE(monitor[i].is_valid());
     StringAppendF(&times, "%.2f,", monitor[i].duration().InMillisecondsF());
   }
 
   bool important = false;
   PrintResultList("createproxy", "", "t", times, "ms", important);
 }