| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 25 #include "content/public/common/result_codes.h" | 25 #include "content/public/common/result_codes.h" |
| 26 #include "content/public/common/url_constants.h" | 26 #include "content/public/common/url_constants.h" |
| 27 #include "extensions/browser/extension_host.h" | 27 #include "extensions/browser/extension_host.h" |
| 28 #include "extensions/browser/extension_registry.h" | 28 #include "extensions/browser/extension_registry.h" |
| 29 #include "extensions/browser/extension_system.h" | 29 #include "extensions/browser/extension_system.h" |
| 30 #include "extensions/browser/process_manager.h" | 30 #include "extensions/browser/process_manager.h" |
| 31 #include "extensions/browser/process_map.h" | 31 #include "extensions/browser/process_map.h" |
| 32 #include "extensions/browser/test_extension_registry_observer.h" | 32 #include "extensions/browser/test_extension_registry_observer.h" |
| 33 #include "extensions/common/constants.h" | 33 #include "extensions/common/constants.h" |
| 34 #include "extensions/test/background_page_watcher.cc" | 34 #include "extensions/test/background_page_watcher.h" |
| 35 #include "ui/message_center/message_center.h" | 35 #include "ui/message_center/message_center.h" |
| 36 #include "ui/message_center/notification_list.h" | 36 #include "ui/message_center/notification_list.h" |
| 37 | 37 |
| 38 using content::NavigationController; | 38 using content::NavigationController; |
| 39 using content::WebContents; | 39 using content::WebContents; |
| 40 using extensions::Extension; | 40 using extensions::Extension; |
| 41 using extensions::ExtensionRegistry; | 41 using extensions::ExtensionRegistry; |
| 42 | 42 |
| 43 // Tests are timing out waiting for extension to crash. | 43 // Tests are timing out waiting for extension to crash. |
| 44 // http://crbug.com/174705 | 44 // http://crbug.com/174705 |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 GetController())); | 562 GetController())); |
| 563 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); | 563 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 564 observer.Wait(); | 564 observer.Wait(); |
| 565 } | 565 } |
| 566 // Extension should now be loaded. | 566 // Extension should now be loaded. |
| 567 SCOPED_TRACE("after reloading the tab"); | 567 SCOPED_TRACE("after reloading the tab"); |
| 568 CheckExtensionConsistency(first_extension_id_); | 568 CheckExtensionConsistency(first_extension_id_); |
| 569 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); | 569 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); |
| 570 ASSERT_EQ(0U, CountBalloons()); | 570 ASSERT_EQ(0U, CountBalloons()); |
| 571 } | 571 } |
| OLD | NEW |