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

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

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 virtual std::string GetEmptyTestName() OVERRIDE { 106 virtual std::string GetEmptyTestName() OVERRIDE {
107 return std::string(); 107 return std::string();
108 } 108 }
109 109
110 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { 110 virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
111 return ContentBrowserTestSuite(argc, argv).Run(); 111 return ContentBrowserTestSuite(argc, argv).Run();
112 } 112 }
113 113
114 virtual bool AdjustChildProcessCommandLine( 114 virtual bool AdjustChildProcessCommandLine(
115 CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE { 115 CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
116 command_line->AppendSwitchPath(switches::kContentShellDataPath, 116 command_line->AppendSwitchPath(switches::kContentShellDataPath,
117 temp_data_dir); 117 temp_data_dir);
118 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 118 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
119 return true; 119 return true;
120 } 120 }
121 121
122 protected: 122 protected:
123 virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE { 123 virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
124 return new ShellMainDelegate(); 124 return new ShellMainDelegate();
125 } 125 }
126 126
127 private: 127 private:
128 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); 128 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
129 }; 129 };
130 130
131 } // namespace content 131 } // namespace content
132 132
133 int main(int argc, char** argv) { 133 int main(int argc, char** argv) {
134 content::ContentTestLauncherDelegate launcher_delegate; 134 content::ContentTestLauncherDelegate launcher_delegate;
135 return LaunchTests(&launcher_delegate, argc, argv); 135 return LaunchTests(&launcher_delegate, argc, argv);
136 } 136 }
OLDNEW
« no previous file with comments | « content/test/content_browser_test_utils.cc ('k') | content/test/gpu/gpu_test_expectations_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698