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

chrome/browser/views/options/advanced_contents_view.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/browser/views/options/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 #include <shellapi.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_set_observer.h"
@@ skipping 1373 matching lines @@
 // AdvancedScrollViewContainer, views::View overrides:
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
 }