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/memory/ref_counted.h" | 5 #include "base/memory/ref_counted.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" | 8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" |
9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" | 9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" |
10 #include "chrome/browser/extensions/api/socket/socket_api.h" | 10 #include "chrome/browser/extensions/api/socket/socket_api.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 | 76 |
77 PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_); | 77 PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_); |
78 app_dir_ = app_dir_.AppendASCII("ppapi/tests/extensions/socket/newlib"); | 78 app_dir_ = app_dir_.AppendASCII("ppapi/tests/extensions/socket/newlib"); |
79 } | 79 } |
80 | 80 |
81 protected: | 81 protected: |
82 void LaunchTestingApp() { | 82 void LaunchTestingApp() { |
83 const Extension* extension = LoadExtension(app_dir_); | 83 const Extension* extension = LoadExtension(app_dir_); |
84 ASSERT_TRUE(extension); | 84 ASSERT_TRUE(extension); |
85 | 85 |
86 AppLaunchParams params(browser()->profile(), extension, | 86 AppLaunchParams params(browser()->profile(), |
87 extensions::LAUNCH_NONE, NEW_WINDOW); | 87 extension, |
| 88 extensions::LAUNCH_CONTAINER_NONE, |
| 89 NEW_WINDOW); |
88 params.command_line = CommandLine::ForCurrentProcess(); | 90 params.command_line = CommandLine::ForCurrentProcess(); |
89 OpenApplication(params); | 91 OpenApplication(params); |
90 } | 92 } |
91 | 93 |
92 private: | 94 private: |
93 base::FilePath app_dir_; | 95 base::FilePath app_dir_; |
94 }; | 96 }; |
95 #endif | 97 #endif |
96 | 98 |
97 } // namespace | 99 } // namespace |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 | 348 |
347 LaunchTestingApp(); | 349 LaunchTestingApp(); |
348 | 350 |
349 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 351 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
350 listener.Reply( | 352 listener.Reply( |
351 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); | 353 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); |
352 | 354 |
353 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 355 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
354 } | 356 } |
355 #endif | 357 #endif |
OLD | NEW |