| 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/stringprintf.h" | 5 #include "base/stringprintf.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/automation/automation_util.h" | 7 #include "chrome/browser/automation/automation_util.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_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_commands.h" | 13 #include "chrome/browser/ui/browser_commands.h" |
| 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
| 18 #include "content/public/browser/render_process_host.h" | 18 #include "content/public/browser/render_process_host.h" |
| 19 #include "content/public/browser/render_view_host.h" | 19 #include "content/public/browser/render_view_host.h" |
| 20 #include "content/public/browser/site_instance.h" | 20 #include "content/public/browser/site_instance.h" |
| 21 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
| 22 #include "content/public/test/browser_test_utils.h" | 22 #include "content/public/test/browser_test_utils.h" |
| 23 #include "net/base/mock_host_resolver.h" | 23 #include "net/dns/mock_host_resolver.h" |
| 24 | 24 |
| 25 using content::ExecuteScript; | 25 using content::ExecuteScript; |
| 26 using content::ExecuteScriptAndExtractString; | 26 using content::ExecuteScriptAndExtractString; |
| 27 using content::NavigationController; | 27 using content::NavigationController; |
| 28 using content::WebContents; | 28 using content::WebContents; |
| 29 using content::RenderViewHost; | 29 using content::RenderViewHost; |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 std::string WrapForJavascriptAndExtract(const char* javascript_expression) { | 33 std::string WrapForJavascriptAndExtract(const char* javascript_expression) { |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 EXPECT_EQ("ss_app2", result); | 508 EXPECT_EQ("ss_app2", result); |
| 509 | 509 |
| 510 ui_test_utils::NavigateToURLWithDisposition( | 510 ui_test_utils::NavigateToURLWithDisposition( |
| 511 browser(), base_url.Resolve("non_app/main.html"), | 511 browser(), base_url.Resolve("non_app/main.html"), |
| 512 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 512 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 513 ASSERT_TRUE(ExecuteScriptAndExtractString( | 513 ASSERT_TRUE(ExecuteScriptAndExtractString( |
| 514 browser()->tab_strip_model()->GetWebContentsAt(0), | 514 browser()->tab_strip_model()->GetWebContentsAt(0), |
| 515 kRetrieveSessionStorage.c_str(), &result)); | 515 kRetrieveSessionStorage.c_str(), &result)); |
| 516 EXPECT_EQ("ss_normal", result); | 516 EXPECT_EQ("ss_normal", result); |
| 517 } | 517 } |
| OLD | NEW |