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

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 46523002: Fix Telemetry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 687 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
688 ExtensionApiTest::SetUpCommandLine(command_line); 688 ExtensionApiTest::SetUpCommandLine(command_line);
689 command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort, "9222"); 689 command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort, "9222");
690 690
691 // Override the extension root path. 691 // Override the extension root path.
692 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); 692 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
693 test_data_dir_ = test_data_dir_.AppendASCII("devtools"); 693 test_data_dir_ = test_data_dir_.AppendASCII("devtools");
694 } 694 }
695 }; 695 };
696 696
697 #if defined(OS_WIN) 697 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) {
698 // Fails on some Win bots http://crbug.com/311502
699 #define MAYBE_RemoteDebugger DISABLED_RemoteDebugger
700 #else
701 #define MAYBE_RemoteDebugger RemoteDebugger
702 #endif
703
704 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, MAYBE_RemoteDebugger) {
705 #if defined(OS_WIN) && defined(USE_ASH) 698 #if defined(OS_WIN) && defined(USE_ASH)
706 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 699 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
707 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 700 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
708 return; 701 return;
709 #endif 702 #endif
710 703
711 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; 704 ASSERT_TRUE(RunExtensionTest("target_list")) << message_;
712 } 705 }
713 706
714 } // namespace 707 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_adb_bridge.cc ('k') | chrome/browser/devtools/devtools_target_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698