Revert 184352

chrome/browser/ui/views/external_protocol_dialog.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_protocol_dialog.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 116 matching lines @@
                                                const std::wstring& command)
     : web_contents_(web_contents),
       url_(url),
       creation_time_(base::TimeTicks::Now()) {
   const int kMaxUrlWithoutSchemeSize = 256;
   const int kMaxCommandSize = 256;
   string16 elided_url_without_scheme;
   string16 elided_command;
   ui::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
                   kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
-  ui::ElideString(base::WideToUTF16Hack(command), kMaxCommandSize,
-                  &elided_command);
+  ui::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command);
 
   string16 message_text = l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
       ASCIIToUTF16(url.scheme() + ":"),
       elided_url_without_scheme) + ASCIIToUTF16("\n\n");
 
   message_text += l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH,
       elided_command) + ASCIIToUTF16("\n\n");
 
@@ skipping 16 matching lines @@
   views::Widget::CreateWindowWithParent(this, root_hwnd)->Show();
 }
 
 // static
 std::wstring ExternalProtocolDialog::GetApplicationForProtocol(
     const GURL& url) {
   // We shouldn't be accessing the registry from the UI thread, since it can go
   // to disk.  http://crbug.com/61996
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  std::wstring url_spec = base::ASCIIToWide(url.possibly_invalid_spec());
+  std::wstring url_spec = ASCIIToWide(url.possibly_invalid_spec());
   std::wstring cmd_key_path =
-      base::ASCIIToWide(url.scheme() + "\\shell\\open\\command");
+      ASCIIToWide(url.scheme() + "\\shell\\open\\command");
   base::win::RegKey cmd_key(HKEY_CLASSES_ROOT, cmd_key_path.c_str(), KEY_READ);
   size_t split_offset = url_spec.find(L':');
   if (split_offset == std::wstring::npos)
     return std::wstring();
   std::wstring parameters = url_spec.substr(split_offset + 1,
                                             url_spec.length() - 1);
   std::wstring application_to_launch;
   if (cmd_key.ReadValue(NULL, &application_to_launch) == ERROR_SUCCESS) {
     ReplaceSubstringsAfterOffset(&application_to_launch, 0, L"%1", parameters);
     return application_to_launch;
   } else {
     return std::wstring();
   }
 }