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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 13638022: Added an options parameter to TpmAttestationSignEnterpriseChallenge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « no previous file | chromeos/cryptohome/async_method_caller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 const DataMethodCallback& callback) OVERRIDE {} 341 const DataMethodCallback& callback) OVERRIDE {}
342 virtual void TpmAttestationRegisterKey( 342 virtual void TpmAttestationRegisterKey(
343 AttestationKeyType key_type, 343 AttestationKeyType key_type,
344 const std::string& key_name, 344 const std::string& key_name,
345 const AsyncMethodCallback& callback) OVERRIDE {} 345 const AsyncMethodCallback& callback) OVERRIDE {}
346 virtual void TpmAttestationSignEnterpriseChallenge( 346 virtual void TpmAttestationSignEnterpriseChallenge(
347 AttestationKeyType key_type, 347 AttestationKeyType key_type,
348 const std::string& key_name, 348 const std::string& key_name,
349 const std::string& domain, 349 const std::string& domain,
350 const std::string& device_id, 350 const std::string& device_id,
351 AttestationChallengeOptions options,
351 const std::string& challenge, 352 const std::string& challenge,
352 const AsyncMethodCallback& callback) OVERRIDE {} 353 const AsyncMethodCallback& callback) OVERRIDE {}
353 virtual void TpmAttestationSignSimpleChallenge( 354 virtual void TpmAttestationSignSimpleChallenge(
354 AttestationKeyType key_type, 355 AttestationKeyType key_type,
355 const std::string& key_name, 356 const std::string& key_name,
356 const std::string& challenge, 357 const std::string& challenge,
357 const AsyncMethodCallback& callback) OVERRIDE {} 358 const AsyncMethodCallback& callback) OVERRIDE {}
358 359
359 private: 360 private:
360 AsyncCallStatusHandler handler_; 361 AsyncCallStatusHandler handler_;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 633
633 TabStripModel* tabs = browser->tab_strip_model(); 634 TabStripModel* tabs = browser->tab_strip_model();
634 ASSERT_TRUE(tabs); 635 ASSERT_TRUE(tabs);
635 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 636 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
636 EXPECT_EQ(expected_tab_count, tabs->count()); 637 EXPECT_EQ(expected_tab_count, tabs->count());
637 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) 638 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i)
638 EXPECT_EQ(GURL(kStartupURLs[i]), tabs->GetWebContentsAt(i)->GetURL()); 639 EXPECT_EQ(GURL(kStartupURLs[i]), tabs->GetWebContentsAt(i)->GetURL());
639 } 640 }
640 641
641 } // namespace policy 642 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chromeos/cryptohome/async_method_caller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698