| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 one_extension_path = one_extension_path | 249 one_extension_path = one_extension_path |
| 250 .AppendASCII("extensions") | 250 .AppendASCII("extensions") |
| 251 .AppendASCII("good") | 251 .AppendASCII("good") |
| 252 .AppendASCII("Extensions") | 252 .AppendASCII("Extensions") |
| 253 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") | 253 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") |
| 254 .AppendASCII("1.0.0.0"); | 254 .AppendASCII("1.0.0.0"); |
| 255 load_extensions_.push_back(one_extension_path.value()); | 255 load_extensions_.push_back(one_extension_path.value()); |
| 256 } | 256 } |
| 257 }; | 257 }; |
| 258 | 258 |
| 259 // Fails inconsistently on Linux x64. http://crbug.com/80961 | |
| 260 // TODO(dpapad): Has not failed since October 2011, let's reenable, monitor | |
| 261 // and act accordingly. | |
| 262 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { | 259 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { |
| 263 WaitForServicesToStart(1, true); | 260 WaitForServicesToStart(1, true); |
| 264 TestInjection(true, true); | 261 TestInjection(true, true); |
| 265 } | 262 } |
| 266 | 263 |
| 267 // ExtensionsLoadMultipleTest | 264 // ExtensionsLoadMultipleTest |
| 268 // Ensures that we can startup the browser with multiple extensions | 265 // Ensures that we can startup the browser with multiple extensions |
| 269 // via --load-extension=X1,X2,X3. | 266 // via --load-extension=X1,X2,X3. |
| 270 class ExtensionsLoadMultipleTest : public ExtensionStartupTestBase { | 267 class ExtensionsLoadMultipleTest : public ExtensionStartupTestBase { |
| 271 public: | 268 public: |
| (...skipping 28 matching lines...) Expand all Loading... |
| 300 .AppendASCII("extensions") | 297 .AppendASCII("extensions") |
| 301 .AppendASCII("app2"); | 298 .AppendASCII("app2"); |
| 302 load_extensions_.push_back(fourth_extension_path.value()); | 299 load_extensions_.push_back(fourth_extension_path.value()); |
| 303 } | 300 } |
| 304 }; | 301 }; |
| 305 | 302 |
| 306 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) { | 303 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) { |
| 307 WaitForServicesToStart(4, true); | 304 WaitForServicesToStart(4, true); |
| 308 TestInjection(true, true); | 305 TestInjection(true, true); |
| 309 } | 306 } |
| OLD | NEW |