summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:42:07 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:42:07 +0000
commit3a81f8e49c41feee532d571423c81fc6ac2c751e (patch)
treeabc2483acc813e76f6e3e48cd2c0b17038b53a9d /chrome/browser/extensions
parentdeb87c8535c2a5bd04152b6f2d2540c5c00bb9f3 (diff)
downloadchromium_src-3a81f8e49c41feee532d571423c81fc6ac2c751e.zip
chromium_src-3a81f8e49c41feee532d571423c81fc6ac2c751e.tar.gz
chromium_src-3a81f8e49c41feee532d571423c81fc6ac2c751e.tar.bz2
Revert "Reland: HTML Pack Extension Dialog / Linux & Mac Packaging Support. Part 1."
This reverts commit c18585b4bd75664122be8af6ff1170cc5c6efc66. TBR=tc Review URL: http://codereview.chromium.org/270015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc2
-rw-r--r--chrome/browser/extensions/pack_extension_job.h8
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 57ae6f6..fa257e0 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -727,6 +727,7 @@ TEST_F(ExtensionsServiceTest, InstallExtension) {
// TODO(erikkay): add tests for upgrade cases.
}
+#if defined(OS_WIN) // TODO(port)
// Test Packaging and installing an extension.
// TODO(rafaelw): add more tests for failure cases.
TEST_F(ExtensionsServiceTest, PackExtension) {
@@ -790,6 +791,7 @@ TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) {
file_util::Delete(crx_path, false);
}
+#endif // defined(OS_WIN)
TEST_F(ExtensionsServiceTest, InstallTheme) {
InitializeEmptyExtensionsService();
diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h
index 8c3cf26..ec00f21 100644
--- a/chrome/browser/extensions/pack_extension_job.h
+++ b/chrome/browser/extensions/pack_extension_job.h
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
-#define CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
-
#include <string>
#include "base/file_path.h"
@@ -14,7 +11,7 @@ class MessageLoop;
// Manages packing an extension on the file thread and reporting the result
// back to the UI.
-class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> {
+class PackExtensionJob : public base::RefCounted<PackExtensionJob> {
public:
// Interface for people who want to use PackExtensionJob to implement.
@@ -49,6 +46,3 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> {
DISALLOW_COPY_AND_ASSIGN(PackExtensionJob);
};
-
-#endif // CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
-