Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

extensions/browser/app_window/test_app_window_contents.h

Index: extensions/browser/app_window/test_app_window_contents.h
diff --git a/extensions/browser/app_window/test_app_window_contents.h b/extensions/browser/app_window/test_app_window_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..211153576e5fa086a7b8974e6ec711ad3f5ed221
--- /dev/null
+++ b/extensions/browser/app_window/test_app_window_contents.h
@@ -0,0 +1,33 @@
+// 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.
+
+#ifndef EXTENSIONS_BROWSER_APP_WINDOW_TEST_APP_WINDOW_CONTENTS_
+#define EXTENSIONS_BROWSER_APP_WINDOW_TEST_APP_WINDOW_CONTENTS_
+
+#include "extensions/browser/app_window/app_window.h"
+
+namespace extensions {
+
+// A dummy version of AppWindowContents for unit tests.
+// Best used with AppWindow::SetAppWindowContentsForTesting().

[James Cook, 2014/11/17 17:48:36]

Thanks for the helpful class comment!

+class TestAppWindowContents : public AppWindowContents {
+ public:
+  explicit TestAppWindowContents(content::WebContents* web_contents);

[James Cook, 2014/11/17 17:48:36]

nit: While not strictly necessary, forward declare content::WebContents?

[Yoyo Zhou, 2014/11/17 23:55:26]

Done.

+  ~TestAppWindowContents() override;
+
+  // apps:AppWindowContents:
+  void Initialize(content::BrowserContext* context, const GURL& url) override;
+  void LoadContents(int32 creator_process_id) override;
+  void NativeWindowChanged(NativeAppWindow* native_app_window) override;
+  void NativeWindowClosed() override;
+  void DispatchWindowShownForTests() const override;
+  content::WebContents* GetWebContents() const override;
+
+ private:
+  scoped_ptr<content::WebContents> web_contents_;
+};

[James Cook, 2014/11/17 17:48:36]

DISALLOW_COPY_AND_ASSIGN + macros.h?

[Yoyo Zhou, 2014/11/17 23:55:26]

Done.

+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_APP_WINDOW_TEST_APP_WINDOW_CONTENTS_