| 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/strings/stringprintf.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/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" |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 EXPECT_EQ("ss_app2", result); | 516 EXPECT_EQ("ss_app2", result); |
| 517 | 517 |
| 518 ui_test_utils::NavigateToURLWithDisposition( | 518 ui_test_utils::NavigateToURLWithDisposition( |
| 519 browser(), base_url.Resolve("non_app/main.html"), | 519 browser(), base_url.Resolve("non_app/main.html"), |
| 520 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 520 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 521 ASSERT_TRUE(ExecuteScriptAndExtractString( | 521 ASSERT_TRUE(ExecuteScriptAndExtractString( |
| 522 browser()->tab_strip_model()->GetWebContentsAt(0), | 522 browser()->tab_strip_model()->GetWebContentsAt(0), |
| 523 kRetrieveSessionStorage.c_str(), &result)); | 523 kRetrieveSessionStorage.c_str(), &result)); |
| 524 EXPECT_EQ("ss_normal", result); | 524 EXPECT_EQ("ss_normal", result); |
| 525 } | 525 } |
| OLD | NEW |