| 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 "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/extensions/extension_host.h" | 9 #include "chrome/browser/extensions/extension_host.h" |
| 10 #include "chrome/browser/extensions/extension_process_manager.h" | 10 #include "chrome/browser/extensions/extension_process_manager.h" |
| 11 #include "chrome/browser/extensions/extension_system.h" | 11 #include "chrome/browser/extensions/extension_system.h" |
| 12 #include "chrome/browser/extensions/extension_test_message_listener.h" | 12 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
| 15 #include "chrome/browser/ui/browser_iterator.h" | 15 #include "chrome/browser/ui/browser_iterator.h" |
| 16 #include "chrome/browser/ui/panels/panel_manager.h" | 16 #include "chrome/browser/ui/panels/panel_manager.h" |
| 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 19 #include "chrome/common/extensions/extension.h" | 19 #include "chrome/common/extensions/extension.h" |
| 20 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 21 #include "content/public/browser/render_process_host.h" | 21 #include "content/public/browser/render_process_host.h" |
| 22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "content/public/common/result_codes.h" | 23 #include "content/public/common/result_codes.h" |
| 24 #include "content/public/test/browser_test_utils.h" | 24 #include "content/public/test/browser_test_utils.h" |
| 25 #include "net/base/mock_host_resolver.h" | 25 #include "net/dns/mock_host_resolver.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 27 | 27 |
| 28 #if defined(USE_ASH) | 28 #if defined(USE_ASH) |
| 29 #include "chrome/browser/extensions/shell_window_registry.h" | 29 #include "chrome/browser/extensions/shell_window_registry.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 #if defined(USE_ASH) && !defined(OS_WIN) | 32 #if defined(USE_ASH) && !defined(OS_WIN) |
| 33 // TODO(stevenjb): Figure out the correct behavior for Ash + Win | 33 // TODO(stevenjb): Figure out the correct behavior for Ash + Win |
| 34 #define USE_ASH_PANELS | 34 #define USE_ASH_PANELS |
| 35 #endif | 35 #endif |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(), | 453 OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(), |
| 454 GURL(std::string("chrome-extension://") + last_loaded_extension_id_ + | 454 GURL(std::string("chrome-extension://") + last_loaded_extension_id_ + |
| 455 "/newtab.html"), false, &newtab)); | 455 "/newtab.html"), false, &newtab)); |
| 456 | 456 |
| 457 // Extension API should succeed. | 457 // Extension API should succeed. |
| 458 bool result = false; | 458 bool result = false; |
| 459 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()", | 459 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()", |
| 460 &result)); | 460 &result)); |
| 461 EXPECT_TRUE(result); | 461 EXPECT_TRUE(result); |
| 462 } | 462 } |
| OLD | NEW |