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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 EXPECT_EQ(tabs_before, tab_strip->count()); | 547 EXPECT_EQ(tabs_before, tab_strip->count()); |
548 EXPECT_EQ(count_before, GetEnabledExtensionCount()); | 548 EXPECT_EQ(count_before, GetEnabledExtensionCount()); |
549 EXPECT_EQ(crash_count_before + 1, GetTerminatedExtensionCount()); | 549 EXPECT_EQ(crash_count_before + 1, GetTerminatedExtensionCount()); |
550 | 550 |
551 { | 551 { |
552 content::WindowedNotificationObserver observer( | 552 content::WindowedNotificationObserver observer( |
553 content::NOTIFICATION_LOAD_STOP, | 553 content::NOTIFICATION_LOAD_STOP, |
554 content::Source<NavigationController>( | 554 content::Source<NavigationController>( |
555 &browser()->tab_strip_model()->GetActiveWebContents()-> | 555 &browser()->tab_strip_model()->GetActiveWebContents()-> |
556 GetController())); | 556 GetController())); |
557 chrome::Reload(browser(), CURRENT_TAB); | 557 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
558 observer.Wait(); | 558 observer.Wait(); |
559 } | 559 } |
560 // Extension should now be loaded. | 560 // Extension should now be loaded. |
561 SCOPED_TRACE("after reloading the tab"); | 561 SCOPED_TRACE("after reloading the tab"); |
562 CheckExtensionConsistency(first_extension_id_); | 562 CheckExtensionConsistency(first_extension_id_); |
563 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); | 563 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); |
564 ASSERT_EQ(0U, CountBalloons()); | 564 ASSERT_EQ(0U, CountBalloons()); |
565 } | 565 } |
OLD | NEW |