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

Side by Side Diff: chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed GYP file. 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/settings/device_oauth2_token_service.h" 5 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/prefs/testing_pref_service.h" 8 #include "base/prefs/testing_pref_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "chrome/browser/chromeos/policy/device_policy_builder.h" 10 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
11 #include "chrome/browser/chromeos/settings/cros_settings.h" 11 #include "chrome/browser/chromeos/settings/cros_settings.h"
12 #include "chrome/browser/chromeos/settings/device_settings_service.h" 12 #include "chrome/browser/chromeos/settings/device_settings_service.h"
13 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 13 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
14 #include "chrome/browser/chromeos/settings/token_encryptor.h" 14 #include "chrome/browser/chromeos/settings/token_encryptor.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/scoped_testing_local_state.h" 16 #include "chrome/test/base/scoped_testing_local_state.h"
17 #include "chrome/test/base/testing_browser_process.h" 17 #include "chrome/test/base/testing_browser_process.h"
18 #include "chromeos/cryptohome/system_salt_getter.h" 18 #include "chromeos/cryptohome/system_salt_getter.h"
19 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "chromeos/dbus/fake_cryptohome_client.h" 20 #include "chromeos/dbus/fake_cryptohome_client.h"
21 #include "components/ownership/mock_owner_key_util.h"
21 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
22 #include "content/public/test/test_browser_thread.h" 23 #include "content/public/test/test_browser_thread.h"
23 #include "google_apis/gaia/gaia_oauth_client.h" 24 #include "google_apis/gaia/gaia_oauth_client.h"
24 #include "google_apis/gaia/oauth2_token_service_test_util.h" 25 #include "google_apis/gaia/oauth2_token_service_test_util.h"
25 #include "net/http/http_status_code.h" 26 #include "net/http/http_status_code.h"
26 #include "net/url_request/test_url_fetcher_factory.h" 27 #include "net/url_request/test_url_fetcher_factory.h"
27 #include "net/url_request/url_fetcher_delegate.h" 28 #include "net/url_request/url_fetcher_delegate.h"
28 #include "net/url_request/url_request_test_util.h" 29 #include "net/url_request/url_request_test_util.h"
29 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
30 31
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 fake_cryptohome_client_ = new FakeCryptohomeClient; 77 fake_cryptohome_client_ = new FakeCryptohomeClient;
77 fake_cryptohome_client_->SetServiceIsAvailable(true); 78 fake_cryptohome_client_->SetServiceIsAvailable(true);
78 fake_cryptohome_client_->set_system_salt( 79 fake_cryptohome_client_->set_system_salt(
79 FakeCryptohomeClient::GetStubSystemSalt()); 80 FakeCryptohomeClient::GetStubSystemSalt());
80 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( 81 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
81 scoped_ptr<CryptohomeClient>(fake_cryptohome_client_)); 82 scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
82 83
83 SystemSaltGetter::Initialize(); 84 SystemSaltGetter::Initialize();
84 85
85 DeviceSettingsService::Initialize(); 86 DeviceSettingsService::Initialize();
86 scoped_refptr<MockOwnerKeyUtil> owner_key_util_(new MockOwnerKeyUtil()); 87 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_(
88 new ownership::MockOwnerKeyUtil());
87 owner_key_util_->SetPublicKeyFromPrivateKey( 89 owner_key_util_->SetPublicKeyFromPrivateKey(
88 *device_policy_.GetSigningKey()); 90 *device_policy_.GetSigningKey());
89 DeviceSettingsService::Get()->SetSessionManager( 91 DeviceSettingsService::Get()->SetSessionManager(
90 &device_settings_test_helper_, owner_key_util_); 92 &device_settings_test_helper_, owner_key_util_);
91 93
92 CrosSettings::Initialize(); 94 CrosSettings::Initialize();
93 } 95 }
94 96
95 virtual void TearDown() OVERRIDE { 97 virtual void TearDown() OVERRIDE {
96 CrosSettings::Shutdown(); 98 CrosSettings::Shutdown();
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 422
421 AssertConsumerTokensAndErrors(0, 1); 423 AssertConsumerTokensAndErrors(0, 1);
422 424
423 // Retry should succeed. 425 // Retry should succeed.
424 request = StartTokenRequest(); 426 request = StartTokenRequest();
425 PerformURLFetches(); 427 PerformURLFetches();
426 AssertConsumerTokensAndErrors(1, 1); 428 AssertConsumerTokensAndErrors(1, 1);
427 } 429 }
428 430
429 } // namespace chromeos 431 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698