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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/extensions/browser_action_test_util.h" | 6 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 7 #include "chrome/browser/extensions/extension_action.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_prefs.h" | 9 #include "chrome/browser/extensions/extension_prefs.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_tab_util.h" | 11 #include "chrome/browser/extensions/extension_tab_util.h" |
11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_tabstrip.h" | 14 #include "chrome/browser/ui/browser_tabstrip.h" |
14 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
15 #include "chrome/browser/ui/omnibox/location_bar.h" | 16 #include "chrome/browser/ui/omnibox/location_bar.h" |
16 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 17 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/extensions/extension.h" | 19 #include "chrome/common/extensions/extension.h" |
19 #include "chrome/common/extensions/extension_action.h" | |
20 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
21 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
22 | 22 |
23 // These are a mash-up of the tests from from page_actions_apitest.cc and | 23 // These are a mash-up of the tests from from page_actions_apitest.cc and |
24 // browser_actions_apitest.cc. | 24 // browser_actions_apitest.cc. |
25 | 25 |
26 using extensions::Extension; | 26 using extensions::Extension; |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 const Extension* extension = GetSingleLoadedExtension(); | 178 const Extension* extension = GetSingleLoadedExtension(); |
179 ASSERT_TRUE(extension) << message_; | 179 ASSERT_TRUE(extension) << message_; |
180 | 180 |
181 ResultCatcher catcher; | 181 ResultCatcher catcher; |
182 ui_test_utils::NavigateToURL(browser(), | 182 ui_test_utils::NavigateToURL(browser(), |
183 GURL(extension->GetResourceURL("update.html"))); | 183 GURL(extension->GetResourceURL("update.html"))); |
184 ASSERT_TRUE(catcher.GetNextResult()); | 184 ASSERT_TRUE(catcher.GetNextResult()); |
185 } | 185 } |
186 | 186 |
187 } | 187 } |
OLD | NEW |