Stability instrumentation Crashpad integration

chrome/install_static/user_data_dir_win_unittest.cc

Index: chrome/install_static/user_data_dir_win_unittest.cc
diff --git a/chrome/install_static/user_data_dir_win_unittest.cc b/chrome/install_static/user_data_dir_win_unittest.cc
index 9e4679b5ae655d258a984936e661464398d82c9a..80e8a6e19ddf4aa8392926b5dd56b2ee3dcc7365 100644
--- a/chrome/install_static/user_data_dir_win_unittest.cc
+++ b/chrome/install_static/user_data_dir_win_unittest.cc
@@ -49,8 +49,8 @@ class ScopedNTRegistryTestingOverride {
 TEST(UserDataDir, EmptyResultsInDefault) {
   std::wstring result, invalid;
 
-  install_static::GetUserDataDirectoryImpl(L"", kFakeInstallConstants, &result,
-                                           &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"", kFakeInstallConstants,
+                                              &result, &invalid);
   EXPECT_TRUE(EndsWith(result, kUserDataDirNameSuffix));
   EXPECT_EQ(std::wstring(), invalid);
 }
@@ -58,8 +58,8 @@ TEST(UserDataDir, EmptyResultsInDefault) {
 TEST(UserDataDir, InvalidResultsInDefault) {
   std::wstring result, invalid;
 
-  install_static::GetUserDataDirectoryImpl(L"<>|:", kFakeInstallConstants,
-                                           &result, &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"<>|:", kFakeInstallConstants,
+                                              &result, &invalid);
   EXPECT_TRUE(EndsWith(result, kUserDataDirNameSuffix));
   EXPECT_EQ(L"<>|:", invalid);
 }
@@ -79,8 +79,8 @@ TEST(UserDataDir, RegistrySettingsInHKLMOverrides) {
   LONG rv = key.WriteValue(kUserDataDirRegistryKey, L"yyy");
   ASSERT_EQ(rv, ERROR_SUCCESS);
 
-  install_static::GetUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
-                                           &result, &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
+                                              &result, &invalid);
 
   EXPECT_TRUE(EndsWith(result, L"\\yyy"));
   EXPECT_EQ(std::wstring(), invalid);
@@ -101,8 +101,8 @@ TEST(UserDataDir, RegistrySettingsInHKCUOverrides) {
   LONG rv = key.WriteValue(kUserDataDirRegistryKey, L"yyy");
   ASSERT_EQ(rv, ERROR_SUCCESS);
 
-  install_static::GetUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
-                                           &result, &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
+                                              &result, &invalid);
 
   EXPECT_TRUE(EndsWith(result, L"\\yyy"));
   EXPECT_EQ(std::wstring(), invalid);
@@ -130,8 +130,8 @@ TEST(UserDataDir, RegistrySettingsInHKLMTakesPrecedenceOverHKCU) {
   rv = key2.WriteValue(kUserDataDirRegistryKey, L"222");
   ASSERT_EQ(rv, ERROR_SUCCESS);
 
-  install_static::GetUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
-                                           &result, &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
+                                              &result, &invalid);
 
   EXPECT_TRUE(EndsWith(result, L"\\111"));
   EXPECT_EQ(std::wstring(), invalid);
@@ -149,8 +149,8 @@ TEST(UserDataDir, RegistrySettingWithPathExpansionHKCU) {
   LONG rv = key.WriteValue(kUserDataDirRegistryKey, L"${windows}");
   ASSERT_EQ(rv, ERROR_SUCCESS);
 
-  install_static::GetUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
-                                           &result, &invalid);
+  install_static::DeriveUserDataDirectoryImpl(L"xxx", kFakeInstallConstants,
+                                              &result, &invalid);
 
   EXPECT_EQ(strlen("X:\\WINDOWS"), result.size());
   EXPECT_EQ(std::wstring::npos, result.find(L"${windows}"));