Allow drag-and-drop of zipped extensions on chrome://extensions

chrome/browser/extensions/zipfile_installer_unittest.cc

Index: chrome/browser/extensions/zipfile_installer_unittest.cc
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3a00d37edbb3e3f61d27c2c52132030709c1b3ce
--- /dev/null
+++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -0,0 +1,122 @@
+// Copyright (c) 2012 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/bind.h"
+#include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/memory/ref_counted.h"
+#include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
+#include "base/run_loop.h"
+#include "base/strings/string_util.h"
+#include "base/values.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/browser/extensions/zipfile_installer.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/test/base/testing_profile.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_registry_observer.h"
+#include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace extensions {
+
+struct MockExtensionRegistryObserver
+    : public extensions::ExtensionRegistryObserver {
+  void WaitForInstall() {
+    scoped_refptr<content::MessageLoopRunner> runner =
+        new content::MessageLoopRunner;
+    quit_closure_ = runner->QuitClosure();
+    runner->Run();
+  }
+
+  virtual void OnExtensionWillBeInstalled(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      bool is_update,
+      bool from_ephemeral,
+      const std::string& old_name) OVERRIDE {
+    last_extension_installed = extension->id();
+    quit_closure_.Run();
+  }
+
+  std::string last_extension_installed;
+  base::Closure quit_closure_;
+};

[asargent_no_longer_on_chrome, 2014/08/07 17:28:25]

It might be helpful to put this class into an anonymous namespace instead of
leaving it in the extensions namespace, so that this won't collide with any
other identically named class in other extension unit tests. 

[elijahtaylor1, 2014/08/07 22:41:25]

Done.

+
+class ZipFileInstallerTest : public testing::Test {
+ public:
+  virtual void SetUp() {
+    browser_threads_.reset(new content::TestBrowserThreadBundle(
+        content::TestBrowserThreadBundle::IO_MAINLOOP));
+    in_process_utility_thread_helper_.reset(
+        new content::InProcessUtilityThreadHelper);
+
+    // Create profile for extension service.
+    profile_.reset(new TestingProfile());
+    TestExtensionSystem* system =
+        static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile_.get()));
+    extension_service_ = system->CreateExtensionService(
+        base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
+    extensions::ExtensionRegistry* registry(
+        extensions::ExtensionRegistry::Get(profile_.get()));
+    registry->AddObserver(&observer_);
+  }
+
+  virtual void TearDown() {
+    // Need to destruct ZipFileInstaller before the message loop since
+    // it posts a task to it.
+    zipfile_installer_ = NULL;
+    extensions::ExtensionRegistry* registry(
+        extensions::ExtensionRegistry::Get(profile_.get()));
+    registry->RemoveObserver(&observer_);
+    profile_.reset();
+    base::RunLoop().RunUntilIdle();
+  }
+
+  void SetupInstaller(const std::string& zip_name) {

[asargent_no_longer_on_chrome, 2014/08/07 17:28:25]

You might consider renaming this to "RunInstaller" or something like that, since
it seems to do more than setup. 

[elijahtaylor1, 2014/08/07 22:41:25]

Done.

+    base::FilePath original_path;
+    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path));
+    original_path = original_path.AppendASCII("extensions")
+                        .AppendASCII("zipfile_installer")
+                        .AppendASCII(zip_name);
+    ASSERT_TRUE(base::PathExists(original_path)) << original_path.value();
+
+    zipfile_installer_ = ZipFileInstaller::Create(extension_service_);
+
+    base::MessageLoopProxy::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ZipFileInstaller::LoadFromZipFile,
+                   zipfile_installer_.get(),
+                   original_path));
+    observer_.WaitForInstall();
+  }
+
+ protected:
+  scoped_refptr<ZipFileInstaller> zipfile_installer_;
+
+  scoped_ptr<TestingProfile> profile_;
+  ExtensionService* extension_service_;
+
+  scoped_ptr<content::TestBrowserThreadBundle> browser_threads_;
+  scoped_ptr<content::InProcessUtilityThreadHelper>
+      in_process_utility_thread_helper_;
+  MockExtensionRegistryObserver observer_;
+};
+
+TEST_F(ZipFileInstallerTest, GoodZip) {
+  SetupInstaller("good.zip");
+}
+
+TEST_F(ZipFileInstallerTest, ZipWithPublicKey) {
+  SetupInstaller("public_key.zip");
+  const char kIdForPublicKey[] = "ikppjpenhoddphklkpdfdfdabbakkpal";
+  EXPECT_EQ(observer_.last_extension_installed, kIdForPublicKey);
+}
+
+}  // namespace extensions