Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

Issue 567553002: TPMTokenLoader: Report both the disabled and enabled state of the TPM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nss_util_deadcode
Patch Set: Addressed nit. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" 5 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 24 matching lines...) Expand all
35 #include "chromeos/cryptohome/system_salt_getter.h" 35 #include "chromeos/cryptohome/system_salt_getter.h"
36 #include "chromeos/dbus/cros_disks_client.h" 36 #include "chromeos/dbus/cros_disks_client.h"
37 #include "chromeos/dbus/cryptohome/rpc.pb.h" 37 #include "chromeos/dbus/cryptohome/rpc.pb.h"
38 #include "chromeos/dbus/dbus_thread_manager.h" 38 #include "chromeos/dbus/dbus_thread_manager.h"
39 #include "chromeos/dbus/fake_cryptohome_client.h" 39 #include "chromeos/dbus/fake_cryptohome_client.h"
40 #include "chromeos/login/auth/key.h" 40 #include "chromeos/login/auth/key.h"
41 #include "chromeos/login/auth/mock_auth_status_consumer.h" 41 #include "chromeos/login/auth/mock_auth_status_consumer.h"
42 #include "chromeos/login/auth/mock_url_fetchers.h" 42 #include "chromeos/login/auth/mock_url_fetchers.h"
43 #include "chromeos/login/auth/test_attempt_state.h" 43 #include "chromeos/login/auth/test_attempt_state.h"
44 #include "chromeos/login/auth/user_context.h" 44 #include "chromeos/login/auth/user_context.h"
45 #include "chromeos/login/login_state.h"
45 #include "components/ownership/mock_owner_key_util.h" 46 #include "components/ownership/mock_owner_key_util.h"
46 #include "content/public/test/test_browser_thread_bundle.h" 47 #include "content/public/test/test_browser_thread_bundle.h"
47 #include "crypto/nss_util_internal.h" 48 #include "crypto/nss_util_internal.h"
48 #include "crypto/scoped_test_nss_chromeos_user.h" 49 #include "crypto/scoped_test_nss_chromeos_user.h"
49 #include "google_apis/gaia/mock_url_fetcher_factory.h" 50 #include "google_apis/gaia/mock_url_fetcher_factory.h"
50 #include "net/base/net_errors.h" 51 #include "net/base/net_errors.h"
51 #include "net/url_request/url_request_status.h" 52 #include "net/url_request/url_request_status.h"
52 #include "testing/gmock/include/gmock/gmock.h" 53 #include "testing/gmock/include/gmock/gmock.h"
53 #include "testing/gtest/include/gtest/gtest.h" 54 #include "testing/gtest/include/gtest/gtest.h"
54 #include "third_party/cros_system_api/dbus/service_constants.h" 55 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 // salt. 831 // salt.
831 ExpectGetKeyDataExCall( 832 ExpectGetKeyDataExCall(
832 make_scoped_ptr(new int64(Key::KEY_TYPE_SALTED_SHA256)), 833 make_scoped_ptr(new int64(Key::KEY_TYPE_SALTED_SHA256)),
833 scoped_ptr<std::string>()); 834 scoped_ptr<std::string>());
834 835
835 auth_->AuthenticateToLogin(NULL, user_context_); 836 auth_->AuthenticateToLogin(NULL, user_context_);
836 base::RunLoop().Run(); 837 base::RunLoop().Run();
837 } 838 }
838 839
839 } // namespace chromeos 840 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698