cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

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

 // Copyright 2013 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 "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 60 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     // Whitelist the extension ID of the test extension.
     command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID,
                                     "epcifkihnkjgphfkloaaleeakhpmgdmn");
 
     // TODO(pneubeck): Remove the following hack, once the NetworkingPrivateAPI
     // uses the ProfileHelper to obtain the userhash crbug/238623.
     std::string login_user =
         command_line->GetSwitchValueNative(switches::kLoginUser);
-    // Do the same as CryptohomeClientStubImpl::GetSanitizedUsername
+    // Do the same as FakeCryptohomeClient::GetSanitizedUsername

[hashimoto, 2013/09/26 08:41:29]

Did you mean CryptohomeClient::GetSanitizedUsername?
btw, why don't you directly use the static function
CryptohomeClient::GetSanitizedUsername here?

[satorux1, 2013/09/26 09:58:36]

Not sure why CryptohomeClient::GetStubSanitizedUsername() is not used here. I
guess this is done this way on purpose. I'd keep this as-is.

     std::string sanitized_user = login_user + kUserIdStubHashSuffix;
     command_line->AppendSwitchASCII(switches::kLoginProfile, sanitized_user);
     if (GetParam())
       command_line->AppendSwitch(::switches::kMultiProfiles);
   }
 
   void InitializeSanitizedUsername() {
     chromeos::UserManager* user_manager = chromeos::UserManager::Get();
     chromeos::User* user = user_manager->GetActiveUser();
     CHECK(user);
@@ skipping 274 matching lines @@
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        VerifyAndEncryptData) {
   EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
 }
 
 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
                         ExtensionNetworkingPrivateApiTest,
                         testing::Bool());
 
 }  // namespace chromeos