Grab bag of clang fixes for Windows code

chrome/browser/ui/views/external_tab_container_win.cc

 // Copyright (c) 2012 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/ui/views/external_tab_container_win.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlconv.h>
 #include <atlcrack.h>
@@ skipping 722 matching lines @@
 }
 
 bool ExternalTabContainerWin::IsPopupOrPanel(const WebContents* source) const {
   return is_popup_window_;
 }
 
 void ExternalTabContainerWin::UpdateTargetURL(WebContents* source,
                                               int32 page_id,
                                               const GURL& url) {
   if (automation_) {
-    string16 url_string = CA2W(url.spec().c_str());
+    string16 url_string = base::UTF8ToUTF16(url.spec());
     automation_->Send(
         new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string));
   }
 }
 
 void ExternalTabContainerWin::ContentsZoomChange(bool zoom_in) {
 }
 
 bool ExternalTabContainerWin::TakeFocus(content::WebContents* source,
                                         bool reverse) {
@@ skipping 643 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   widget_->CloseNow();
   return new_contents;
 }