OLD | NEW |
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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h" | 10 #include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 } | 82 } |
83 | 83 |
84 virtual PrefService* GetPrefs(content::WebContents* web_contents) OVERRIDE { | 84 virtual PrefService* GetPrefs(content::WebContents* web_contents) OVERRIDE { |
85 return &pref_service_; | 85 return &pref_service_; |
86 } | 86 } |
87 | 87 |
88 virtual const GURL& GetURL(content::WebContents* web_contents) OVERRIDE { | 88 virtual const GURL& GetURL(content::WebContents* web_contents) OVERRIDE { |
89 return url_; | 89 return url_; |
90 } | 90 } |
91 | 91 |
92 virtual User* GetUser(content::WebContents* web_contents) OVERRIDE { | 92 virtual user_manager::User* GetUser( |
| 93 content::WebContents* web_contents) OVERRIDE { |
93 return mock_user_manager_.GetActiveUser(); | 94 return mock_user_manager_.GetActiveUser(); |
94 } | 95 } |
95 | 96 |
96 virtual HostContentSettingsMap* GetContentSettings( | 97 virtual HostContentSettingsMap* GetContentSettings( |
97 content::WebContents* web_contents) OVERRIDE { | 98 content::WebContents* web_contents) OVERRIDE { |
98 return content_settings_; | 99 return content_settings_; |
99 } | 100 } |
100 | 101 |
101 virtual bool IsGuestOrIncognito(content::WebContents* web_contents) OVERRIDE { | 102 virtual bool IsGuestOrIncognito(content::WebContents* web_contents) OVERRIDE { |
102 return is_incognito_; | 103 return is_incognito_; |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 | 472 |
472 TEST_F(PlatformVerificationFlowTest, IncognitoMode) { | 473 TEST_F(PlatformVerificationFlowTest, IncognitoMode) { |
473 fake_delegate_.set_is_incognito(true); | 474 fake_delegate_.set_is_incognito(true); |
474 verifier_->ChallengePlatformKey(NULL, kTestID, kTestChallenge, callback_); | 475 verifier_->ChallengePlatformKey(NULL, kTestID, kTestChallenge, callback_); |
475 base::RunLoop().RunUntilIdle(); | 476 base::RunLoop().RunUntilIdle(); |
476 EXPECT_EQ(PlatformVerificationFlow::PLATFORM_NOT_VERIFIED, result_); | 477 EXPECT_EQ(PlatformVerificationFlow::PLATFORM_NOT_VERIFIED, result_); |
477 } | 478 } |
478 | 479 |
479 } // namespace attestation | 480 } // namespace attestation |
480 } // namespace chromeos | 481 } // namespace chromeos |
OLD | NEW |