Make ApplicationImpl::args() be a std::vector<std::string>

mojo/services/native_viewport/main.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 14 matching lines @@
       public InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate()
       : share_group_(new gfx::GLShareGroup),
         mailbox_manager_(new gpu::gles2::MailboxManager),
         is_headless_(false) {}
   virtual ~NativeViewportAppDelegate() {}
 
  private:
   bool HasArg(const std::string& arg) {
-    return std::find(args_.begin(), args_.end(), arg) != args_.end();
+    const auto& args = app_->args();
+    return std::find(args.begin(), args.end(), arg) != args.end();
   }
 
   // ApplicationDelegate implementation.
   virtual void Initialize(ApplicationImpl* application) override {
     app_ = application;
-    args_ = application->args().To<std::vector<std::string> >();
 
 #if !defined(COMPONENT_BUILD)
     if (HasArg(kUseTestConfig))
       gfx::GLSurface::InitializeOneOffForTests();
     else
       gfx::GLSurface::InitializeOneOff();
 #endif
     is_headless_ = HasArg(kUseHeadlessConfig);
   }
 
@@ skipping 11 matching lines @@
   }
 
   // InterfaceFactory<Gpu> implementation.
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<Gpu> request) override {
     BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()),
                   &request);
   }
 
   ApplicationImpl* app_;
-  std::vector<std::string> args_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   bool is_headless_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
 }
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::NativeViewportAppDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(shell_handle);
 }