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

Side by Side Diff: content/shell/shell_browser_main_parts.cc

Issue 10821037: Move a number of other tests from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: a little cleaner Created 8 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
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/shell_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 12 matching lines...) Expand all
23 #if defined(OS_ANDROID) 23 #if defined(OS_ANDROID)
24 #include "net/base/network_change_notifier.h" 24 #include "net/base/network_change_notifier.h"
25 #include "net/android/network_change_notifier_factory.h" 25 #include "net/android/network_change_notifier_factory.h"
26 #endif 26 #endif
27 27
28 namespace content { 28 namespace content {
29 29
30 static GURL GetStartupURL() { 30 static GURL GetStartupURL() {
31 CommandLine* command_line = CommandLine::ForCurrentProcess(); 31 CommandLine* command_line = CommandLine::ForCurrentProcess();
32 if (command_line->HasSwitch(switches::kContentBrowserTest)) 32 if (command_line->HasSwitch(switches::kContentBrowserTest))
33 return GURL(chrome::kAboutBlankURL); 33 return GURL();
34 const CommandLine::StringVector& args = command_line->GetArgs(); 34 const CommandLine::StringVector& args = command_line->GetArgs();
35 if (args.empty()) 35 if (args.empty())
36 return GURL("http://www.google.com/"); 36 return GURL("http://www.google.com/");
37 37
38 return GURL(args[0]); 38 return GURL(args[0]);
39 } 39 }
40 40
41 ShellBrowserMainParts::ShellBrowserMainParts( 41 ShellBrowserMainParts::ShellBrowserMainParts(
42 const MainFunctionParams& parameters) 42 const MainFunctionParams& parameters)
43 : BrowserMainParts(), 43 : BrowserMainParts(),
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } 108 }
109 109
110 void ShellBrowserMainParts::PostMainMessageLoopRun() { 110 void ShellBrowserMainParts::PostMainMessageLoopRun() {
111 if (devtools_delegate_) 111 if (devtools_delegate_)
112 devtools_delegate_->Stop(); 112 devtools_delegate_->Stop();
113 browser_context_.reset(); 113 browser_context_.reset();
114 off_the_record_browser_context_.reset(); 114 off_the_record_browser_context_.reset();
115 } 115 }
116 116
117 } // namespace 117 } // namespace
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698