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 "chrome/browser/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 | 40 |
41 using extensions::Extension; | 41 using extensions::Extension; |
42 using extensions::ExtensionCreator; | 42 using extensions::ExtensionCreator; |
43 | 43 |
44 ExtensionBrowserTest::ExtensionBrowserTest() | 44 ExtensionBrowserTest::ExtensionBrowserTest() |
45 : loaded_(false), | 45 : loaded_(false), |
46 installed_(false), | 46 installed_(false), |
47 extension_installs_observed_(0), | 47 extension_installs_observed_(0), |
48 extension_load_errors_observed_(0), | 48 extension_load_errors_observed_(0), |
49 target_page_action_count_(-1), | 49 target_page_action_count_(-1), |
50 target_visible_page_action_count_(-1) { | 50 target_visible_page_action_count_(-1), |
| 51 current_channel_(chrome::VersionInfo::CHANNEL_DEV) { |
51 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); | 52 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); |
52 AppShortcutManager::SetShortcutCreationDisabledForTesting(true); | 53 AppShortcutManager::SetShortcutCreationDisabledForTesting(true); |
53 } | 54 } |
54 | 55 |
55 ExtensionBrowserTest::~ExtensionBrowserTest() { | 56 ExtensionBrowserTest::~ExtensionBrowserTest() { |
56 AppShortcutManager::SetShortcutCreationDisabledForTesting(false); | 57 AppShortcutManager::SetShortcutCreationDisabledForTesting(false); |
57 } | 58 } |
58 | 59 |
59 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { | 60 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { |
60 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); | 61 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); |
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 case content::NOTIFICATION_LOAD_STOP: | 673 case content::NOTIFICATION_LOAD_STOP: |
673 VLOG(1) << "Got LOAD_STOP notification."; | 674 VLOG(1) << "Got LOAD_STOP notification."; |
674 MessageLoopForUI::current()->Quit(); | 675 MessageLoopForUI::current()->Quit(); |
675 break; | 676 break; |
676 | 677 |
677 default: | 678 default: |
678 NOTREACHED(); | 679 NOTREACHED(); |
679 break; | 680 break; |
680 } | 681 } |
681 } | 682 } |
OLD | NEW |