summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mojo/common/test/multiprocess_test_helper.cc7
-rw-r--r--mojo/embedder/platform_channel_pair_posix.cc4
-rw-r--r--mojo/embedder/platform_channel_pair_win.cc4
-rw-r--r--mojo/examples/aura_demo/aura_demo.cc2
-rw-r--r--mojo/examples/launcher/launcher.cc2
-rw-r--r--mojo/services/dbus_echo/dbus_echo_service.cc2
-rw-r--r--mojo/services/view_manager/main.cc2
-rw-r--r--mojo/shell/android/mojo_main.cc6
-rw-r--r--mojo/shell/child_process.cc3
-rw-r--r--mojo/shell/child_process_host.cc5
-rw-r--r--mojo/shell/context.cc2
-rw-r--r--mojo/shell/desktop/mojo_main.cc6
-rw-r--r--mojo/shell/dynamic_service_loader.cc2
-rw-r--r--mojo/shell/loader.cc3
-rw-r--r--mojo/shell/run.cc7
-rw-r--r--mojo/shell/shell_test_helper.cc2
16 files changed, 32 insertions, 27 deletions
diff --git a/mojo/common/test/multiprocess_test_helper.cc b/mojo/common/test/multiprocess_test_helper.cc
index ae7acae..7e9df3e 100644
--- a/mojo/common/test/multiprocess_test_helper.cc
+++ b/mojo/common/test/multiprocess_test_helper.cc
@@ -33,7 +33,8 @@ void MultiprocessTestHelper::StartChild(const std::string& test_child_name) {
std::string test_child_main = test_child_name + "TestChildMain";
- CommandLine command_line(base::GetMultiProcessTestChildBaseCommandLine());
+ base::CommandLine command_line(
+ base::GetMultiProcessTestChildBaseCommandLine());
embedder::HandlePassingInformation handle_passing_info;
platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
&command_line, &handle_passing_info);
@@ -72,10 +73,10 @@ bool MultiprocessTestHelper::WaitForChildTestShutdown() {
// static
void MultiprocessTestHelper::ChildSetup() {
- CHECK(CommandLine::InitializedForCurrentProcess());
+ CHECK(base::CommandLine::InitializedForCurrentProcess());
client_platform_handle =
embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
- *CommandLine::ForCurrentProcess());
+ *base::CommandLine::ForCurrentProcess());
}
// static
diff --git a/mojo/embedder/platform_channel_pair_posix.cc b/mojo/embedder/platform_channel_pair_posix.cc
index 2d5e2ca..4eaea47 100644
--- a/mojo/embedder/platform_channel_pair_posix.cc
+++ b/mojo/embedder/platform_channel_pair_posix.cc
@@ -60,7 +60,7 @@ PlatformChannelPair::PlatformChannelPair() {
// static
ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
std::string client_fd_string =
command_line.GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch);
int client_fd = -1;
@@ -75,7 +75,7 @@ ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
}
void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
- CommandLine* command_line,
+ base::CommandLine* command_line,
base::FileHandleMappingVector* handle_passing_info) const {
DCHECK(command_line);
DCHECK(handle_passing_info);
diff --git a/mojo/embedder/platform_channel_pair_win.cc b/mojo/embedder/platform_channel_pair_win.cc
index 2248d31..f3eee92 100644
--- a/mojo/embedder/platform_channel_pair_win.cc
+++ b/mojo/embedder/platform_channel_pair_win.cc
@@ -73,7 +73,7 @@ PlatformChannelPair::PlatformChannelPair() {
// static
ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
std::string client_handle_string =
command_line.GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch);
@@ -89,7 +89,7 @@ ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
}
void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
- CommandLine* command_line,
+ base::CommandLine* command_line,
base::HandlesToInheritVector* handle_passing_info) const {
DCHECK(command_line);
DCHECK(handle_passing_info);
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
index 46879d9..9927eeb 100644
--- a/mojo/examples/aura_demo/aura_demo.cc
+++ b/mojo/examples/aura_demo/aura_demo.cc
@@ -177,7 +177,7 @@ class AuraDemo : public Application {
extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain(
MojoHandle shell_handle) {
- CommandLine::Init(0, NULL);
+ base::CommandLine::Init(0, NULL);
base::AtExitManager at_exit;
base::MessageLoop loop;
mojo::GLES2Initializer gles2;
diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc
index b1fe4b8..400689f 100644
--- a/mojo/examples/launcher/launcher.cc
+++ b/mojo/examples/launcher/launcher.cc
@@ -267,7 +267,7 @@ class LauncherImpl : public InterfaceImpl<Launcher>,
extern "C" LAUNCHER_EXPORT MojoResult CDECL MojoMain(
MojoHandle shell_handle) {
- CommandLine::Init(0, NULL);
+ base::CommandLine::Init(0, NULL);
base::AtExitManager at_exit;
base::i18n::InitializeICU();
diff --git a/mojo/services/dbus_echo/dbus_echo_service.cc b/mojo/services/dbus_echo/dbus_echo_service.cc
index f9e476e..bc063b2 100644
--- a/mojo/services/dbus_echo/dbus_echo_service.cc
+++ b/mojo/services/dbus_echo/dbus_echo_service.cc
@@ -35,7 +35,7 @@ const char kServiceName[] = "org.chromium.EchoService";
int main(int argc, char** argv) {
base::AtExitManager exit_manager;
- CommandLine::Init(argc, argv);
+ base::CommandLine::Init(argc, argv);
logging::LoggingSettings settings;
settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index 60a850b..3b1f6e6 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -21,7 +21,7 @@
extern "C" VIEW_MANAGER_EXPORT MojoResult CDECL MojoMain(
MojoHandle shell_handle) {
- CommandLine::Init(0, NULL);
+ base::CommandLine::Init(0, NULL);
base::AtExitManager at_exit;
base::MessageLoop loop;
mojo::Application app(shell_handle);
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index 9d70c8f..8abf733 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -38,14 +38,14 @@ LazyInstance<scoped_ptr<shell::Context> > g_context =
LazyInstance<scoped_ptr<mojo::Environment> > g_env =
LAZY_INSTANCE_INITIALIZER;
-} // namspace
+} // namespace
static void Init(JNIEnv* env, jclass clazz, jobject context) {
base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
base::android::InitApplicationContext(env, scoped_context);
- CommandLine::Init(0, 0);
+ base::CommandLine::Init(0, 0);
mojo::shell::InitializeLogging();
g_java_message_loop.Get().reset(new base::MessageLoopForUI);
@@ -71,7 +71,7 @@ static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
std::vector<std::string> argv;
argv.push_back("mojo_shell");
argv.push_back(app_url);
- CommandLine::ForCurrentProcess()->InitFromArgv(argv);
+ base::CommandLine::ForCurrentProcess()->InitFromArgv(argv);
}
g_env.Get().reset(new Environment);
diff --git a/mojo/shell/child_process.cc b/mojo/shell/child_process.cc
index 01e3a0c..24728af 100644
--- a/mojo/shell/child_process.cc
+++ b/mojo/shell/child_process.cc
@@ -19,7 +19,8 @@ ChildProcess::~ChildProcess() {
}
// static
-scoped_ptr<ChildProcess> ChildProcess::Create(const CommandLine& command_line) {
+scoped_ptr<ChildProcess> ChildProcess::Create(
+ const base::CommandLine& command_line) {
if (!command_line.HasSwitch(switches::kChildProcessType))
return scoped_ptr<ChildProcess>();
diff --git a/mojo/shell/child_process_host.cc b/mojo/shell/child_process_host.cc
index 98674c0..e743522 100644
--- a/mojo/shell/child_process_host.cc
+++ b/mojo/shell/child_process_host.cc
@@ -70,8 +70,9 @@ bool ChildProcessHost::DoLaunch() {
switches::kVModule,
};
- const CommandLine* parent_command_line = CommandLine::ForCurrentProcess();
- CommandLine child_command_line(parent_command_line->GetProgram());
+ const base::CommandLine* parent_command_line =
+ base::CommandLine::ForCurrentProcess();
+ base::CommandLine child_command_line(parent_command_line->GetProgram());
child_command_line.CopySwitchesFrom(*parent_command_line, kForwardSwitches,
arraysize(kForwardSwitches));
child_command_line.AppendSwitchASCII(
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 4435f4c..d2dc6fa 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -83,7 +83,7 @@ Context::Context()
scoped_ptr<net::NetworkDelegate>(new NetworkDelegate()),
storage_.profile_path()) {
setup.Get();
- CommandLine* cmdline = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
if (cmdline->HasSwitch(switches::kEnableMultiprocess))
runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 98dc7a9..c1e796a 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -38,11 +38,11 @@ class TestChildProcessHostDelegate
int main(int argc, char** argv) {
base::AtExitManager at_exit;
mojo::Environment env;
- CommandLine::Init(argc, argv);
+ base::CommandLine::Init(argc, argv);
mojo::shell::InitializeLogging();
// TODO(vtl): Move this a proper test (and remove includes marked "remove").
- if (CommandLine::ForCurrentProcess()->HasSwitch("run-test-child")) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("run-test-child")) {
base::MessageLoop message_loop(
scoped_ptr<base::MessagePump>(new mojo::common::MessagePumpMojo()));
@@ -61,7 +61,7 @@ int main(int argc, char** argv) {
// TODO(vtl): Unify parent and child process cases to the extent possible.
if (scoped_ptr<mojo::shell::ChildProcess> child_process =
mojo::shell::ChildProcess::Create(
- *CommandLine::ForCurrentProcess())) {
+ *base::CommandLine::ForCurrentProcess())) {
child_process->Main();
} else {
gfx::GLSurface::InitializeOneOff();
diff --git a/mojo/shell/dynamic_service_loader.cc b/mojo/shell/dynamic_service_loader.cc
index 01b572b..a54edd6 100644
--- a/mojo/shell/dynamic_service_loader.cc
+++ b/mojo/shell/dynamic_service_loader.cc
@@ -45,7 +45,7 @@ class DynamicServiceLoader::LoadContext : public mojo::shell::Loader::Delegate {
if (url.SchemeIs("mojo")) {
std::string origin =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kOrigin);
std::string lib = MakeSharedLibraryName(url.ExtractFileName());
url_to_load = GURL(origin + "/" + lib);
diff --git a/mojo/shell/loader.cc b/mojo/shell/loader.cc
index 71d6616..f537717 100644
--- a/mojo/shell/loader.cc
+++ b/mojo/shell/loader.cc
@@ -77,7 +77,8 @@ scoped_ptr<Loader::Job> Loader::Load(const GURL& app_url, Delegate* delegate) {
#else
job->fetcher_->SaveResponseToTemporaryFile(file_runner_.get());
#endif
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableCache))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCache))
job->fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
job->fetcher_->Start();
return job.Pass();
diff --git a/mojo/shell/run.cc b/mojo/shell/run.cc
index d032d7d..8451485 100644
--- a/mojo/shell/run.cc
+++ b/mojo/shell/run.cc
@@ -19,15 +19,16 @@ namespace shell {
void Run(Context* context) {
KeepAlive keep_alive(context);
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- CommandLine::StringVector args = command_line.GetArgs();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
+ base::CommandLine::StringVector args = command_line.GetArgs();
if (args.empty()) {
LOG(ERROR) << "No app path specified.";
return;
}
- for (CommandLine::StringVector::const_iterator it = args.begin();
+ for (base::CommandLine::StringVector::const_iterator it = args.begin();
it != args.end(); ++it) {
GURL url(*it);
if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) {
diff --git a/mojo/shell/shell_test_helper.cc b/mojo/shell/shell_test_helper.cc
index 240eb43..a33810d 100644
--- a/mojo/shell/shell_test_helper.cc
+++ b/mojo/shell/shell_test_helper.cc
@@ -51,7 +51,7 @@ class ShellTestHelper::TestShellClient : public ShellClient {
ShellTestHelper::ShellTestHelper()
: shell_thread_("shell_test_helper"),
state_(NULL) {
- CommandLine::Init(0, NULL);
+ base::CommandLine::Init(0, NULL);
mojo::shell::InitializeLogging();
}
generated by cgit v1.1 at 2025-02-10 20:53:32 +0000