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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 8894008: Make CF net tests a content::BrowserMainParts. (Closed) Base URL: ssh://joi@192.168.1.201/home/joi/c/chrome/src@cfnettests
Patch Set: Address review comments. Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 275
276 InitializeMainThread(); 276 InitializeMainThread();
277 277
278 // Start tracing to a file if needed. 278 // Start tracing to a file if needed.
279 if (base::debug::TraceLog::GetInstance()->IsEnabled()) 279 if (base::debug::TraceLog::GetInstance()->IsEnabled())
280 TraceController::GetInstance()->InitStartupTracing(parsed_command_line_); 280 TraceController::GetInstance()->InitStartupTracing(parsed_command_line_);
281 281
282 system_monitor_.reset(new base::SystemMonitor); 282 system_monitor_.reset(new base::SystemMonitor);
283 hi_res_timer_manager_.reset(new HighResolutionTimerManager); 283 hi_res_timer_manager_.reset(new HighResolutionTimerManager);
284 284
285 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); 285 // DO NOT SUBMIT
286 //network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
286 287
287 #if defined(OS_WIN) 288 #if defined(OS_WIN)
288 system_message_window_.reset(new SystemMessageWindowWin); 289 system_message_window_.reset(new SystemMessageWindowWin);
289 #endif 290 #endif
290 291
291 if (parts_.get()) 292 if (parts_.get())
292 parts_->PostMainMessageLoopStart(); 293 parts_->PostMainMessageLoopStart();
293 } 294 }
294 295
295 void BrowserMainLoop::RunMainMessageLoopParts( 296 void BrowserMainLoop::RunMainMessageLoopParts(
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); 555 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task);
555 556
556 #if defined(OS_MACOSX) 557 #if defined(OS_MACOSX)
557 MessageLoopForUI::current()->Run(); 558 MessageLoopForUI::current()->Run();
558 #else 559 #else
559 MessageLoopForUI::current()->RunWithDispatcher(NULL); 560 MessageLoopForUI::current()->RunWithDispatcher(NULL);
560 #endif 561 #endif
561 } 562 }
562 563
563 } // namespace content 564 } // namespace content
OLDNEW
« chrome_frame/test/net/fake_external_tab.cc ('K') | « chrome_frame/test/poor_mans_trybot.bat ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698