| OLD | NEW |
| 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 <set> | 6 #include <set> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 void Wait() { | 827 void Wait() { |
| 828 if (!observed_) | 828 if (!observed_) |
| 829 run_loop_.Run(); | 829 run_loop_.Run(); |
| 830 } | 830 } |
| 831 | 831 |
| 832 private: | 832 private: |
| 833 // extensions::ExtensionRegistryObserver: | 833 // extensions::ExtensionRegistryObserver: |
| 834 void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, | 834 void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, |
| 835 const extensions::Extension* extension, | 835 const extensions::Extension* extension, |
| 836 bool is_update, | 836 bool is_update, |
| 837 bool from_ephemeral, | |
| 838 const std::string& old_name) override { | 837 const std::string& old_name) override { |
| 839 if (waiting_extension_id_ == extension->id()) { | 838 if (waiting_extension_id_ == extension->id()) { |
| 840 observed_ = true; | 839 observed_ = true; |
| 841 run_loop_.Quit(); | 840 run_loop_.Quit(); |
| 842 } | 841 } |
| 843 } | 842 } |
| 844 | 843 |
| 845 // content::NotificationObserver: | 844 // content::NotificationObserver: |
| 846 void Observe(int type, | 845 void Observe(int type, |
| 847 const content::NotificationSource& source, | 846 const content::NotificationSource& source, |
| (...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2436 ASSERT_TRUE(content::ExecuteScript(contents_, | 2435 ASSERT_TRUE(content::ExecuteScript(contents_, |
| 2437 "$('tos-accept-button').click();")); | 2436 "$('tos-accept-button').click();")); |
| 2438 | 2437 |
| 2439 WaitForSessionStart(); | 2438 WaitForSessionStart(); |
| 2440 } | 2439 } |
| 2441 | 2440 |
| 2442 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, | 2441 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, |
| 2443 TermsOfServiceDownloadTest, testing::Bool()); | 2442 TermsOfServiceDownloadTest, testing::Bool()); |
| 2444 | 2443 |
| 2445 } // namespace policy | 2444 } // namespace policy |
| OLD | NEW |