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

Side by Side Diff: content/test/content_test_launcher.cc

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix compile Created 8 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 "content/public/test/test_launcher.h" 5 #include "content/public/test/test_launcher.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 virtual bool AdjustChildProcessCommandLine( 95 virtual bool AdjustChildProcessCommandLine(
96 CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE { 96 CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE {
97 command_line->AppendSwitchPath(switches::kContentShellDataPath, 97 command_line->AppendSwitchPath(switches::kContentShellDataPath,
98 temp_data_dir); 98 temp_data_dir);
99 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 99 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
100 return true; 100 return true;
101 } 101 }
102 102
103 protected: 103 protected:
104 virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE { 104 virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
105 return new ShellMainDelegate(); 105 return new ShellMainDelegate();
106 } 106 }
107 107
108 private: 108 private:
109 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); 109 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
110 }; 110 };
111 111
112 } // namespace content 112 } // namespace content
113 113
114 int main(int argc, char** argv) { 114 int main(int argc, char** argv) {
115 content::ContentTestLauncherDelegate launcher_delegate; 115 content::ContentTestLauncherDelegate launcher_delegate;
116 return LaunchTests(&launcher_delegate, argc, argv); 116 return LaunchTests(&launcher_delegate, argc, argv);
117 } 117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698