| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 using extensions::Extension; | 43 using extensions::Extension; |
| 44 using extensions::ExtensionCreator; | 44 using extensions::ExtensionCreator; |
| 45 | 45 |
| 46 ExtensionBrowserTest::ExtensionBrowserTest() | 46 ExtensionBrowserTest::ExtensionBrowserTest() |
| 47 : loaded_(false), | 47 : loaded_(false), |
| 48 installed_(false), | 48 installed_(false), |
| 49 extension_installs_observed_(0), | 49 extension_installs_observed_(0), |
| 50 extension_load_errors_observed_(0), | 50 extension_load_errors_observed_(0), |
| 51 target_page_action_count_(-1), | 51 target_page_action_count_(-1), |
| 52 target_visible_page_action_count_(-1), | 52 target_visible_page_action_count_(-1), |
| 53 current_channel_(chrome::VersionInfo::CHANNEL_DEV) { | 53 current_channel_(chrome::VersionInfo::CHANNEL_DEV), |
| 54 override_prompt_for_external_extensions_( |
| 55 extensions::FeatureSwitch::prompt_for_external_extensions(), false) { |
| 54 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); | 56 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); |
| 55 } | 57 } |
| 56 | 58 |
| 57 ExtensionBrowserTest::~ExtensionBrowserTest() {} | 59 ExtensionBrowserTest::~ExtensionBrowserTest() {} |
| 58 | 60 |
| 59 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { | 61 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { |
| 60 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); | 62 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); |
| 61 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); | 63 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); |
| 62 | 64 |
| 63 #if defined(OS_CHROMEOS) | 65 #if defined(OS_CHROMEOS) |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 case content::NOTIFICATION_LOAD_STOP: | 680 case content::NOTIFICATION_LOAD_STOP: |
| 679 VLOG(1) << "Got LOAD_STOP notification."; | 681 VLOG(1) << "Got LOAD_STOP notification."; |
| 680 MessageLoopForUI::current()->Quit(); | 682 MessageLoopForUI::current()->Quit(); |
| 681 break; | 683 break; |
| 682 | 684 |
| 683 default: | 685 default: |
| 684 NOTREACHED(); | 686 NOTREACHED(); |
| 685 break; | 687 break; |
| 686 } | 688 } |
| 687 } | 689 } |
| OLD | NEW |