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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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
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 "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h" 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 //////////////////////////////////////////////////////////////////////////////// 315 ////////////////////////////////////////////////////////////////////////////////
316 316
317 NetInternalsTest::NetInternalsTest() 317 NetInternalsTest::NetInternalsTest()
318 : test_server_started_(false) { 318 : test_server_started_(false) {
319 message_handler_.reset(new MessageHandler(this)); 319 message_handler_.reset(new MessageHandler(this));
320 } 320 }
321 321
322 NetInternalsTest::~NetInternalsTest() { 322 NetInternalsTest::~NetInternalsTest() {
323 } 323 }
324 324
325 void NetInternalsTest::SetUpCommandLine(CommandLine* command_line) { 325 void NetInternalsTest::SetUpCommandLine(base::CommandLine* command_line) {
326 WebUIBrowserTest::SetUpCommandLine(command_line); 326 WebUIBrowserTest::SetUpCommandLine(command_line);
327 // Needed to test the prerender view. 327 // Needed to test the prerender view.
328 command_line->AppendSwitchASCII(switches::kPrerenderMode, 328 command_line->AppendSwitchASCII(switches::kPrerenderMode,
329 switches::kPrerenderModeSwitchValueEnabled); 329 switches::kPrerenderModeSwitchValueEnabled);
330 } 330 }
331 331
332 void NetInternalsTest::SetUpOnMainThread() { 332 void NetInternalsTest::SetUpOnMainThread() {
333 WebUIBrowserTest::SetUpOnMainThread(); 333 WebUIBrowserTest::SetUpOnMainThread();
334 // Increase the memory allowed in a prerendered page above normal settings, 334 // Increase the memory allowed in a prerendered page above normal settings,
335 // as debug builds use more memory and often go over the usual limit. 335 // as debug builds use more memory and often go over the usual limit.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 if (test_server_started_) 368 if (test_server_started_)
369 return true; 369 return true;
370 test_server_started_ = test_server()->Start(); 370 test_server_started_ = test_server()->Start();
371 371
372 // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1 372 // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1
373 // are forbidden. 373 // are forbidden.
374 host_resolver()->AddRule("testdomain.com", "127.0.0.1"); 374 host_resolver()->AddRule("testdomain.com", "127.0.0.1");
375 host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1"); 375 host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1");
376 return test_server_started_; 376 return test_server_started_;
377 } 377 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698