Minimize headless code that refers to aura.

headless/lib/browser/headless_browser_impl.h

 // 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.
 
 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_BROWSER_IMPL_H_
 #define HEADLESS_LIB_BROWSER_HEADLESS_BROWSER_IMPL_H_
 
 #include "headless/public/headless_browser.h"
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
+#include "content/public/browser/web_contents.h"
 #include "headless/lib/browser/headless_devtools_manager_delegate.h"
 #include "headless/lib/browser/headless_web_contents_impl.h"
-
-namespace aura {
-class WindowTreeHost;
-
-namespace client {
-class WindowParentingClient;
-}
-}
+#include "headless/lib/browser/headless_window_tree_host.h"

[Eric Seckler, 2017/02/09 18:29:39]

This reflects what Sami mentioned in headless_window_tree_host.h: I don't think
we can include/use HeadlessWindowTreeHost here, since it depends on aura?

[dvallet, 2017/02/10 05:12:20]

Done, I've added #if defined(USE_AURA) directives, similar to how it's done in
https://cs.chromium.org/chromium/src/content/shell/browser/shell.h 

 
 namespace headless {
 
 class HeadlessBrowserContextImpl;
 class HeadlessBrowserMainParts;
 
 class HeadlessBrowserImpl : public HeadlessBrowser {
  public:
   HeadlessBrowserImpl(
       const base::Callback<void(HeadlessBrowser*)>& on_start_callback,
@@ skipping 27 matching lines @@
   HeadlessBrowser::Options* options() { return &options_; }
 
   HeadlessBrowserContext* CreateBrowserContext(
       HeadlessBrowserContext::Builder* builder);
   // Close given |browser_context| and delete it
   // (all web contents associated with it go away too).
   void DestroyBrowserContext(HeadlessBrowserContextImpl* browser_context);
 
   base::WeakPtr<HeadlessBrowserImpl> GetWeakPtr();
 
-  aura::WindowTreeHost* window_tree_host() const;
+  // All the methods that begin with Platform need to be implemented by the
+  // platform specific headless implementation.
+  // Helper for one time initialization of application
+  void PlatformInitialize();
+  void PlatformCreateWindow();
+  void PlatformSetContents(const gfx::Size& initial_size,

[Sami, 2017/02/09 18:08:22]

nit: PlatformSetWebContents since that's what the object is typically called

[dvallet, 2017/02/10 05:12:20]

Done

+                           content::WebContents* web_contents);
+
+  HeadlessWindowTreeHost* window_tree_host() const;
 
  protected:
   base::Callback<void(HeadlessBrowser*)> on_start_callback_;
   HeadlessBrowser::Options options_;
   HeadlessBrowserMainParts* browser_main_parts_;  // Not owned.
 
   // TODO(eseckler): Currently one window and one window_tree_host
   // is used for all web contents. We should probably use one
   // window per web contents, but additional investigation is needed.
-  std::unique_ptr<aura::WindowTreeHost> window_tree_host_;
-  std::unique_ptr<aura::client::WindowParentingClient> window_parenting_client_;
+  std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_;
 
   std::unordered_map<std::string, std::unique_ptr<HeadlessBrowserContextImpl>>
       browser_contexts_;
   HeadlessBrowserContext* default_browser_context_;  // Not owned.
 
   base::WeakPtrFactory<HeadlessBrowserImpl> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HeadlessBrowserImpl);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_LIB_BROWSER_HEADLESS_BROWSER_IMPL_H_