Revert 184352

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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 534 matching lines @@
     }
     uintptr_t cookie = reinterpret_cast<uintptr_t>(new_container.get());
     pending_tabs_.Get()[cookie] = new_container;
     new_container->set_pending(true);
     new_container->set_is_popup_window(disposition == NEW_POPUP);
     AttachExternalTabParams attach_params_;
     attach_params_.cookie = static_cast<uint64>(cookie);
     attach_params_.dimensions = initial_pos;
     attach_params_.user_gesture = user_gesture;
     attach_params_.disposition = disposition;
-    attach_params_.profile_name = base::WideToUTF8(
+    attach_params_.profile_name = WideToUTF8(
         profile->GetPath().DirName().BaseName().value());
     automation_->Send(new AutomationMsg_AttachExternalTab(
         tab_handle_, attach_params_));
   } else {
     NOTREACHED();
   }
 }
 
 void ExternalTabContainerWin::WebContentsCreated(WebContents* source_contents,
                                                  int64 source_frame_id,
@@ skipping 447 matching lines @@
   // If this is very early in the game then there may not be an entry.
   if (!entry)
     return false;
 
   nav_info->navigation_type = nav_type;
   nav_info->relative_offset = relative_offset;
   nav_info->navigation_index =
       web_contents_->GetController().GetCurrentEntryIndex();
   nav_info->url = entry->GetURL();
   nav_info->referrer = entry->GetReferrer().url;
-  nav_info->title = base::UTF16ToWideHack(entry->GetTitle());
+  nav_info->title = UTF16ToWideHack(entry->GetTitle());
   if (nav_info->title.empty())
-    nav_info->title = base::UTF8ToWide(nav_info->url.spec());
+    nav_info->title = UTF8ToWide(nav_info->url.spec());
 
   nav_info->security_style = entry->GetSSL().security_style;
   int content_status = entry->GetSSL().content_status;
   nav_info->displayed_insecure_content =
       !!(content_status & SSLStatus::DISPLAYED_INSECURE_CONTENT);
   nav_info->ran_insecure_content =
       !!(content_status & SSLStatus::RAN_INSECURE_CONTENT);
   return true;
 }
 
@@ skipping 242 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.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }