win: string_util.h -> utf_string_conversions.h fix.

chrome_frame/test/chrome_frame_test_utils.cc

 // Copyright (c) 2006-2008 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/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/registry.h"   // to find IE and firefox
 #include "base/scoped_handle.h"
 #include "base/scoped_comptr_win.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_frame_test {
 
 const int kDefaultWaitForIEToTerminateMs = 10 * 1000;
 
 const wchar_t kIEImageName[] = L"iexplore.exe";
@@ skipping 391 matching lines @@
 _ATL_FUNC_INFO WebBrowserEventSink::kFileDownloadInfo = {
   CC_STDCALL, VT_EMPTY, 2, {
     VT_BOOL,
     VT_BOOL | VT_BYREF
   }
 };
 
 // WebBrowserEventSink member defines
 void WebBrowserEventSink::Attach(IDispatch* browser_disp) {
   EXPECT_TRUE(NULL != browser_disp);
-  if(browser_disp) {
+  if (browser_disp) {
     EXPECT_HRESULT_SUCCEEDED(web_browser2_.QueryFrom(browser_disp));
     EXPECT_TRUE(S_OK == DispEventAdvise(web_browser2_,
                                         &DIID_DWebBrowserEvents2));
   }
 }
 
 void WebBrowserEventSink::Uninitialize() {
   DisconnectFromChromeFrame();
   if (web_browser2_.get()) {
     DispEventUnadvise(web_browser2_);
@@ skipping 312 matching lines @@
 void WebBrowserEventSink::WatchChromeWindow(const wchar_t* window_class) {
   DCHECK(window_class);
   window_watcher_.AddObserver(this, WideToUTF8(window_class));
 }
 
 void WebBrowserEventSink::StopWatching() {
   window_watcher_.RemoveObserver(this);
 }
 
 }  // namespace chrome_frame_test