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

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.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/bind.h" 5 #include "base/bind.h"
6 #include "base/cancelable_callback.h" 6 #include "base/cancelable_callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 27 matching lines...) Expand all
38 #include "content/public/browser/devtools_http_handler.h" 38 #include "content/public/browser/devtools_http_handler.h"
39 #include "content/public/browser/devtools_manager.h" 39 #include "content/public/browser/devtools_manager.h"
40 #include "content/public/browser/notification_registrar.h" 40 #include "content/public/browser/notification_registrar.h"
41 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
42 #include "content/public/browser/render_view_host.h" 42 #include "content/public/browser/render_view_host.h"
43 #include "content/public/browser/web_contents.h" 43 #include "content/public/browser/web_contents.h"
44 #include "content/public/browser/worker_service.h" 44 #include "content/public/browser/worker_service.h"
45 #include "content/public/browser/worker_service_observer.h" 45 #include "content/public/browser/worker_service_observer.h"
46 #include "content/public/common/content_switches.h" 46 #include "content/public/common/content_switches.h"
47 #include "content/public/test/browser_test_utils.h" 47 #include "content/public/test/browser_test_utils.h"
48 #include "extensions/common/switches.h"
48 #include "net/socket/tcp_listen_socket.h" 49 #include "net/socket/tcp_listen_socket.h"
49 #include "net/test/spawned_test_server/spawned_test_server.h" 50 #include "net/test/spawned_test_server/spawned_test_server.h"
50 51
51 using content::BrowserThread; 52 using content::BrowserThread;
52 using content::DevToolsManager; 53 using content::DevToolsManager;
53 using content::DevToolsAgentHost; 54 using content::DevToolsAgentHost;
54 using content::NavigationController; 55 using content::NavigationController;
55 using content::RenderViewHost; 56 using content::RenderViewHost;
56 using content::WebContents; 57 using content::WebContents;
57 using content::WorkerService; 58 using content::WorkerService;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 break; 261 break;
261 } 262 }
262 } 263 }
263 264
264 base::FilePath test_extensions_dir_; 265 base::FilePath test_extensions_dir_;
265 }; 266 };
266 267
267 class DevToolsExperimentalExtensionTest : public DevToolsExtensionTest { 268 class DevToolsExperimentalExtensionTest : public DevToolsExtensionTest {
268 public: 269 public:
269 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 270 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
270 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 271 command_line->AppendSwitch(
272 extensions::switches::kEnableExperimentalExtensionApis);
271 } 273 }
272 }; 274 };
273 275
274 class WorkerDevToolsSanityTest : public InProcessBrowserTest { 276 class WorkerDevToolsSanityTest : public InProcessBrowserTest {
275 public: 277 public:
276 WorkerDevToolsSanityTest() : window_(NULL) {} 278 WorkerDevToolsSanityTest() : window_(NULL) {}
277 279
278 protected: 280 protected:
279 class WorkerData : public base::RefCountedThreadSafe<WorkerData> { 281 class WorkerData : public base::RefCountedThreadSafe<WorkerData> {
280 public: 282 public:
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 #if defined(OS_WIN) && defined(USE_ASH) 664 #if defined(OS_WIN) && defined(USE_ASH)
663 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 665 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
664 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 666 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
665 return; 667 return;
666 #endif 668 #endif
667 669
668 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; 670 ASSERT_TRUE(RunExtensionTest("target_list")) << message_;
669 } 671 }
670 672
671 } // namespace 673 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698