Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/shell_integration_win_unittest.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/shell_integration.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 49 matching lines @@
     non_default_user_data_dir_chrome_app_id_ =
         ShellIntegration::GetChromiumModelIdForProfile(
         non_default_user_data_dir_.AppendASCII(chrome::kInitialProfile));
     non_default_user_data_dir_and_profile_chrome_app_id_ =
         ShellIntegration::GetChromiumModelIdForProfile(
         non_default_user_data_dir_.Append(non_default_profile_));
 
 
     extension_id_ = L"chromiumexampleappidforunittests";
     base::string16 app_name =
-        UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId(
-        UTF16ToUTF8(extension_id_)));
+        base::UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId(
+        base::UTF16ToUTF8(extension_id_)));
     extension_app_id_ =
         ShellIntegration::GetAppModelIdForProfile(app_name,
                                                   default_profile_path);
     non_default_profile_extension_app_id_ =
         ShellIntegration::GetAppModelIdForProfile(
         app_name,
         default_user_data_dir.Append(non_default_profile_));
 
     CreateShortcuts();
   }
@@ skipping 285 matching lines @@
                 default_profile_path));
 
   // Non-default profile path should get chrome::kBrowserAppID + AppList joined
   // with profile info.
   base::FilePath profile_path(FILE_PATH_LITERAL("root"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
   EXPECT_EQ(base_app_id + L".udd.UserDataTest",
             ShellIntegration::GetAppListAppModelIdForProfile(profile_path));
 }