headless: Make HeadlessBrowser::Options move-only

headless/lib/browser/headless_browser_impl.cc

 // Copyright 2015 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 "headless/lib/browser/headless_browser_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "headless/lib/browser/headless_browser_context.h"
 #include "headless/lib/browser/headless_browser_main_parts.h"
 #include "headless/lib/browser/headless_web_contents_impl.h"
 #include "headless/lib/browser/headless_window_tree_client.h"
 #include "headless/lib/headless_content_main_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace headless {
 
 HeadlessBrowserImpl::HeadlessBrowserImpl(
     const base::Callback<void(HeadlessBrowser*)>& on_start_callback,
-    const HeadlessBrowser::Options& options)
+    HeadlessBrowser::Options options)
     : on_start_callback_(on_start_callback),
-      options_(options),
+      options_(std::move(options)),
       browser_main_parts_(nullptr) {
   DCHECK(!on_start_callback_.is_null());
 }
 
 HeadlessBrowserImpl::~HeadlessBrowserImpl() {}
 
 HeadlessWebContents* HeadlessBrowserImpl::CreateWebContents(
     const GURL& initial_url,
     const gfx::Size& size) {
   DCHECK(BrowserMainThread()->BelongsToCurrentThread());
@@ skipping 67 matching lines @@
 }
 
 void HeadlessBrowserImpl::DestroyWebContents(
     HeadlessWebContentsImpl* web_contents) {
   auto it = web_contents_.find(web_contents);
   DCHECK(it != web_contents_.end());
   web_contents_.erase(it);
 }
 
 void HeadlessBrowserImpl::SetOptionsForTesting(
-    const HeadlessBrowser::Options& options) {
-  options_ = options;
-  browser_context()->SetOptionsForTesting(options);
+    HeadlessBrowser::Options options) {
+  options_ = std::move(options);
+  browser_context()->SetOptionsForTesting(&options_);
 }
 
 int HeadlessBrowserMain(
-    const HeadlessBrowser::Options& options,
+    HeadlessBrowser::Options options,
     const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) {
-  std::unique_ptr<HeadlessBrowserImpl> browser(
-      new HeadlessBrowserImpl(on_browser_start_callback, options));
+  content::ContentMainParams params(nullptr);
+  params.argc = options.argc;
+  params.argv = options.argv;
 
   // TODO(skyostil): Implement custom message pumps.
   DCHECK(!options.message_pump);
 
+  std::unique_ptr<HeadlessBrowserImpl> browser(
+      new HeadlessBrowserImpl(on_browser_start_callback, std::move(options)));
   headless::HeadlessContentMainDelegate delegate(std::move(browser));
-  content::ContentMainParams params(&delegate);
-  params.argc = options.argc;
-  params.argv = options.argv;
+  params.delegate = &delegate;
   return content::ContentMain(params);
 }
 
 }  // namespace headless