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

extensions/shell/browser/shell_native_app_window_aura_unittest.cc

Index: extensions/shell/browser/shell_native_app_window_aura_unittest.cc
diff --git a/extensions/shell/browser/shell_native_app_window_aura_unittest.cc b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..81abe427e55ec1ee71de1ceb3c764552ea22b6b0
--- /dev/null
+++ b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
@@ -0,0 +1,76 @@
+// 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 "extensions/shell/browser/shell_native_app_window_aura.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/test_browser_context.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/test_app_window_contents.h"
+#include "extensions/browser/extensions_test.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_builder.h"
+#include "extensions/shell/browser/desktop_controller.h"
+#include "extensions/shell/browser/shell_app_delegate.h"
+#include "extensions/shell/browser/shell_app_window_client.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace extensions {
+
+class ShellNativeAppWindowAuraTest : public ExtensionsTest {
+ public:
+  ShellNativeAppWindowAuraTest()
+      : notification_service_(content::NotificationService::Create()) {

[James Cook, 2014/11/17 20:54:22]

Not necessarily for this CL: I think we should create a
content::NotificationService in ExtensionsTest. I get bitten in the ass by this
every time I make a new test and it's pretty confusing.  WDYT?

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

I agree. Added a TODO.

+    AppWindowClient::Set(&app_window_client_);
+  }
+
+  ~ShellNativeAppWindowAuraTest() override {}
+
+  void TearDown() override { ExtensionsTest::TearDown(); }

[James Cook, 2014/11/17 20:54:22]

not needed

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

Done.

+
+ protected:
+  content::TestBrowserThreadBundle thread_bundle_;
+  scoped_ptr<content::NotificationService> notification_service_;
+  ShellAppWindowClient app_window_client_;
+};
+
+TEST_F(ShellNativeAppWindowAuraTest, Bounds) {
+  // The BrowserContext used here must be destroyed before the thread bundle,
+  // because of destructors of things spawned from creating a WebContents.
+  scoped_ptr<content::BrowserContext> browser_context(
+      new content::TestBrowserContext);
+  scoped_refptr<Extension> extension =
+      ExtensionBuilder()
+          .SetManifest(DictionaryBuilder()
+                           .Set("name", "test extension")
+                           .Set("version", "1")
+                           .Set("manifest_version", 2))
+          .Build();
+
+  AppWindow* app_window = new AppWindow(
+      browser_context.get(), new ShellAppDelegate, extension.get());
+  content::WebContents* web_contents = content::WebContents::Create(
+      content::WebContents::CreateParams(browser_context.get()));
+  app_window->SetAppWindowContentsForTesting(
+      make_scoped_ptr(new TestAppWindowContents(web_contents)));
+
+  AppWindow::BoundsSpecification window_spec;
+  window_spec.bounds = gfx::Rect(100, 200, 300, 400);

[James Cook, 2014/11/17 20:54:22]

+1 for varying the data!

+  AppWindow::CreateParams params;
+  params.window_spec = window_spec;
+
+  ShellNativeAppWindowAura window(app_window, params);
+
+  gfx::Rect bounds = window.GetBounds();
+  ASSERT_EQ(window_spec.bounds, bounds);

[James Cook, 2014/11/17 20:54:22]

EXPECT_EQ? Do you want the test to crash if this doesn't match?

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

Done.

+
+  // Delete the AppWindow.
+  app_window->OnNativeClose();
+}
+
+}  // namespace extensions

[James Cook, 2014/11/17 20:54:22]

Thanks for writing this test. I know it was a pain, but it helps find places
where the testing system isn't easy enough to use.