Fix various bits of error-handling in NSSDecryptor.

chrome/utility/importer/firefox_importer_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 "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/utility/importer/firefox_importer_unittest_utils.h"
@@ skipping 27 matching lines @@
   ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
 
   ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
   EXPECT_EQ(base::ASCIIToUTF16("hello"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECKa"
                               "jtRg4qFSHBAhv9luFkXgDJA=="));
   // Test UTF-16 encoding.
   EXPECT_EQ(base::WideToUTF16(L"\x4E2D"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECLW"
                               "qqiccfQHWBAie74hxnULxlw=="));
+
+  // Test empty string edge case.
+  EXPECT_EQ(base::string16(), decryptor_proxy.Decrypt(""));

[Ilya Sherman, 2014/08/06 01:29:16]

nit: Prefer std::string() to "".

[davidben, 2014/08/06 17:47:59]

Done.

+
+  // Test invalid base64.
+  EXPECT_EQ(base::string16(), decryptor_proxy.Decrypt("Not! Valid! Base64!"));
 }
 
 // The following test verifies proper detection of authentication scheme in
 // firefox's signons db. We insert two entries into moz_logins table. The first
 // has httpRealm column filled with non-empty string, therefore resulting
 // PasswordForm should have SCHEME_BASIC in scheme. The second entry has NULL
 // httpRealm, so it should produce a SCHEME_HTML PasswordForm.
 TEST(FirefoxImporterTest, MAYBE_NSS(FirefoxNSSDecryptorDeduceAuthScheme)) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ skipping 42 matching lines @@
   ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
 
   ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
   std::vector<autofill::PasswordForm> forms =
       decryptor_proxy.ParseSignons(signons_path);
 
   ASSERT_EQ(2u, forms.size());
   EXPECT_EQ(autofill::PasswordForm::SCHEME_BASIC, forms[0].scheme);
   EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, forms[1].scheme);
 }