Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/browser/extensions/api/socket/socket_apitest.cc

Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_function_test_utils.h" 12 #include "chrome/browser/extensions/extension_function_test_utils.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_test_message_listener.h" 14 #include "chrome/browser/extensions/extension_test_message_listener.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/extensions/application_launch.h" 16 #include "chrome/browser/ui/extensions/application_launch.h"
17 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
20 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
21 #include "net/dns/mock_host_resolver.h" 20 #include "net/dns/mock_host_resolver.h"
22 #include "net/test/spawned_test_server/spawned_test_server.h" 21 #include "net/test/spawned_test_server/spawned_test_server.h"
23 22
24 using extensions::Extension; 23 using extensions::Extension;
25 24
26 namespace utils = extension_function_test_utils; 25 namespace utils = extension_function_test_utils;
27 26
28 namespace { 27 namespace {
29 28
30 // TODO(jschuh): Hanging plugin tests. crbug.com/244653 29 // TODO(jschuh): Hanging plugin tests. crbug.com/244653
31 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) 30 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
32 #define MAYBE(x) DISABLED_##x 31 #define MAYBE(x) DISABLED_##x
33 #else 32 #else
34 #define MAYBE(x) x 33 #define MAYBE(x) x
35 #endif 34 #endif
36 35
37 const std::string kHostname = "127.0.0.1"; 36 const std::string kHostname = "127.0.0.1";
38 const int kPort = 8888; 37 const int kPort = 8888;
39 38
40 class SocketApiTest : public ExtensionApiTest { 39 class SocketApiTest : public ExtensionApiTest {
41 public: 40 public:
42 SocketApiTest() : resolver_event_(true, false), 41 SocketApiTest() : resolver_event_(true, false),
43 resolver_creator_( 42 resolver_creator_(
44 new extensions::MockHostResolverCreator()) { 43 new extensions::MockHostResolverCreator()) {
45 } 44 }
46 45
47 // We need this while the socket.{listen,accept} methods require the
48 // enable-experimental-extension-apis flag. After that we should remove it,
49 // as well as the "experimental" permission in the test apps' manifests.
50 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
51 ExtensionApiTest::SetUpCommandLine(command_line);
52 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
53 }
54
55 virtual void SetUpOnMainThread() OVERRIDE { 46 virtual void SetUpOnMainThread() OVERRIDE {
56 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( 47 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
57 resolver_creator_->CreateMockHostResolver()); 48 resolver_creator_->CreateMockHostResolver());
58 } 49 }
59 50
60 virtual void CleanUpOnMainThread() OVERRIDE { 51 virtual void CleanUpOnMainThread() OVERRIDE {
61 extensions::HostResolverWrapper::GetInstance()-> 52 extensions::HostResolverWrapper::GetInstance()->
62 SetHostResolverForTesting(NULL); 53 SetHostResolverForTesting(NULL);
63 resolver_creator_->DeleteMockHostResolver(); 54 resolver_creator_->DeleteMockHostResolver();
64 } 55 }
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 333
343 LaunchTestingApp(); 334 LaunchTestingApp();
344 335
345 EXPECT_TRUE(listener.WaitUntilSatisfied()); 336 EXPECT_TRUE(listener.WaitUntilSatisfied());
346 listener.Reply( 337 listener.Reply(
347 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); 338 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort));
348 339
349 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 340 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
350 } 341 }
351 #endif 342 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698