cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 56c6fb96df46705e51e82c6176658e7e4547ebd7..84d362aa1ff3fd70c44fe6c9f86aea2b363383a1 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -37,7 +37,6 @@ namespace chromeos {
 
 #if defined(OS_CHROMEOS)
 const char kUser1ProfilePath[] = "/profile/user1/shill";
-const char kUserIdStubHashSuffix[] = "-hash";
 #endif  // defined(OS_CHROMEOS)
 
 
@@ -78,8 +77,8 @@ class ExtensionNetworkingPrivateApiTest :
     // uses the ProfileHelper to obtain the userhash crbug/238623.
     std::string login_user =
         command_line->GetSwitchValueNative(switches::kLoginUser);
-    // Do the same as CryptohomeClientStubImpl::GetSanitizedUsername
-    std::string sanitized_user = login_user + kUserIdStubHashSuffix;
+    std::string sanitized_user = CryptohomeClient::GetStubSanitizedUsername(
+        login_user);
     command_line->AppendSwitchASCII(switches::kLoginProfile, sanitized_user);
     if (GetParam())
       command_line->AppendSwitch(::switches::kMultiProfiles);