| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 | 203 |
| 204 listener.reset(new ExtensionTestMessageListener(false)); | 204 listener.reset(new ExtensionTestMessageListener(false)); |
| 205 ASSERT_TRUE(listener->WaitUntilSatisfied()); | 205 ASSERT_TRUE(listener->WaitUntilSatisfied()); |
| 206 EXPECT_EQ("true", listener->message()); | 206 EXPECT_EQ("true", listener->message()); |
| 207 } | 207 } |
| 208 | 208 |
| 209 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest, CanEmbedExtensionOptions) { | 209 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest, CanEmbedExtensionOptions) { |
| 210 scoped_ptr<ExtensionTestMessageListener> listener( | 210 scoped_ptr<ExtensionTestMessageListener> listener( |
| 211 new ExtensionTestMessageListener("ready", true)); | 211 new ExtensionTestMessageListener("ready", true)); |
| 212 | 212 |
| 213 const Extension* extension = InstallExtension( | 213 const Extension* extension = |
| 214 test_data_dir_.AppendASCII("extension_options").AppendASCII("embed_self"), | 214 LoadExtension(test_data_dir_.AppendASCII("extension_options") |
| 215 1); | 215 .AppendASCII("embed_self")); |
| 216 ASSERT_TRUE(extension); | 216 ASSERT_TRUE(extension); |
| 217 | 217 |
| 218 ASSERT_TRUE(RunTestOnExtensionsFrame("can_embed_extension_options.js")); | 218 ASSERT_TRUE(RunTestOnExtensionsFrame("can_embed_extension_options.js")); |
| 219 | 219 |
| 220 ASSERT_TRUE(listener->WaitUntilSatisfied()); | 220 ASSERT_TRUE(listener->WaitUntilSatisfied()); |
| 221 listener->Reply(extension->id()); | 221 listener->Reply(extension->id()); |
| 222 listener.reset(new ExtensionTestMessageListener("guest loaded", false)); | 222 listener.reset(new ExtensionTestMessageListener("guest loaded", false)); |
| 223 ASSERT_TRUE(listener->WaitUntilSatisfied()); | 223 ASSERT_TRUE(listener->WaitUntilSatisfied()); |
| 224 } | 224 } |
| 225 | 225 |
| 226 } // namespace | 226 } // namespace |
| 227 | 227 |
| 228 } // namespace extensions | 228 } // namespace extensions |
| OLD | NEW |