| 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_util.h" | 10 #include "base/file_util.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/browser/extensions/extension_util.h" | 27 #include "chrome/browser/extensions/extension_util.h" |
| 28 #include "chrome/browser/extensions/unpacked_installer.h" | 28 #include "chrome/browser/extensions/unpacked_installer.h" |
| 29 #include "chrome/browser/profiles/profile.h" | 29 #include "chrome/browser/profiles/profile.h" |
| 30 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
| 31 #include "chrome/browser/ui/browser.h" | 31 #include "chrome/browser/ui/browser.h" |
| 32 #include "chrome/browser/ui/browser_window.h" | 32 #include "chrome/browser/ui/browser_window.h" |
| 33 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 33 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 34 #include "chrome/common/chrome_paths.h" | 34 #include "chrome/common/chrome_paths.h" |
| 35 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
| 36 #include "chrome/common/chrome_version_info.h" | 36 #include "chrome/common/chrome_version_info.h" |
| 37 #include "chrome/common/extensions/extension_set.h" | |
| 38 #include "chrome/test/base/ui_test_utils.h" | 37 #include "chrome/test/base/ui_test_utils.h" |
| 39 #include "content/public/browser/navigation_controller.h" | 38 #include "content/public/browser/navigation_controller.h" |
| 40 #include "content/public/browser/navigation_entry.h" | 39 #include "content/public/browser/navigation_entry.h" |
| 41 #include "content/public/browser/notification_registrar.h" | 40 #include "content/public/browser/notification_registrar.h" |
| 42 #include "content/public/browser/notification_service.h" | 41 #include "content/public/browser/notification_service.h" |
| 43 #include "content/public/browser/render_view_host.h" | 42 #include "content/public/browser/render_view_host.h" |
| 44 #include "content/public/test/browser_test_utils.h" | 43 #include "content/public/test/browser_test_utils.h" |
| 45 #include "extensions/common/constants.h" | 44 #include "extensions/common/constants.h" |
| 45 #include "extensions/common/extension_set.h" |
| 46 #include "sync/api/string_ordinal.h" | 46 #include "sync/api/string_ordinal.h" |
| 47 | 47 |
| 48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
| 49 #include "chromeos/chromeos_switches.h" | 49 #include "chromeos/chromeos_switches.h" |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 using extensions::Extension; | 52 using extensions::Extension; |
| 53 using extensions::ExtensionCreator; | 53 using extensions::ExtensionCreator; |
| 54 using extensions::FeatureSwitch; | 54 using extensions::FeatureSwitch; |
| 55 using extensions::Manifest; | 55 using extensions::Manifest; |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 EXPECT_EQ(expected_hosts, num_hosts); | 577 EXPECT_EQ(expected_hosts, num_hosts); |
| 578 return host; | 578 return host; |
| 579 } | 579 } |
| 580 | 580 |
| 581 std::string ExtensionBrowserTest::ExecuteScriptInBackgroundPage( | 581 std::string ExtensionBrowserTest::ExecuteScriptInBackgroundPage( |
| 582 const std::string& extension_id, | 582 const std::string& extension_id, |
| 583 const std::string& script) { | 583 const std::string& script) { |
| 584 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( | 584 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( |
| 585 profile(), extension_id, script); | 585 profile(), extension_id, script); |
| 586 } | 586 } |
| OLD | NEW |