Revert "Move ExtensionCache to //extensions"

This reverts commit 1056c8a4ddb699dec826e75358f554c0e4790ae2.

Reason for revert: Seems to have caused test flakiness with non-empty message
loop. See https://crbug.com/422884.

BUG=422884
TBR=rockot@chromium.org

Review URL: https://codereview.chromium.org/653623002

Cr-Commit-Position: refs/heads/master@{#299294}

3 files changed, 0 insertions, 140 deletions

diff --git a/extensions/browser/updater/extension_cache.h b/extensions/browser/updater/extension_cache.h
deleted file mode 100644
index f6bdb02..0000000
--- a/extensions/browser/updater/extension_cache.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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_UPDATER_EXTENSION_CACHE_H_
-#define EXTENSIONS_BROWSER_UPDATER_EXTENSION_CACHE_H_
-
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/files/file_path.h"
-
-namespace extensions {
-
-// ExtensionCache interface that caches extensions .crx files to share them
-// between multiple users and profiles on the machine.
-class ExtensionCache {
- public:
-  // Callback that is invoked when the file placed when PutExtension done.
-  typedef base::Callback<void(const base::FilePath& file_path,
-                              bool file_ownership_passed)> PutExtensionCallback;
-
-  ExtensionCache() {}
-  virtual ~ExtensionCache() {}
-
-  // Initialize cache in background. The |callback| is called when cache ready.
-  // Can be called multiple times. The |callback| can be called immediately if
-  // cache is ready.
-  virtual void Start(const base::Closure& callback) = 0;
-
-  // Shut down the cache. Must be called at most once on browser shutdown.
-  virtual void Shutdown(const base::Closure& callback) = 0;
-
-  // Allow caching for the extension with given |id|. User specific extensions
-  // should not be cached for privacy reasons. But default apps including policy
-  // configured can be cached. Can be called before Init.
-  virtual void AllowCaching(const std::string& id) = 0;
-
-  // If extension with |id| exists in the cache, returns |true|, |file_path| and
-  // |version| for the extension. Extension will be marked as used with current
-  // timestamp.
-  virtual bool GetExtension(const std::string& id,
-                            base::FilePath* file_path,
-                            std::string* version) = 0;
-
-  // Put extension with |id| and |version| into local cache. Older version in
-  // the cache will removed be on next run so it can be safely used. Extension
-  // will be marked as used with current timestamp. The file will be available
-  // via GetExtension when |callback| is called. Original |file_path| won't be
-  // deleted from the disk. There is no guarantee that |callback| will be
-  // called.
-  virtual void PutExtension(const std::string& id,
-                            const base::FilePath& file_path,
-                            const std::string& version,
-                            const PutExtensionCallback& callback) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ExtensionCache);
-};
-
-}  // namespace extensions
-
-#endif  // EXTENSIONS_BROWSER_UPDATER_EXTENSION_CACHE_H_
diff --git a/extensions/browser/updater/null_extension_cache.cc b/extensions/browser/updater/null_extension_cache.cc
deleted file mode 100644
index 3241d20..0000000
--- a/extensions/browser/updater/null_extension_cache.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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/browser/updater/null_extension_cache.h"
-
-#include "base/callback.h"
-
-namespace extensions {
-
-NullExtensionCache::NullExtensionCache() {
-}
-
-NullExtensionCache::~NullExtensionCache() {
-}
-
-void NullExtensionCache::Start(const base::Closure& callback) {
-  callback.Run();
-}
-
-void NullExtensionCache::Shutdown(const base::Closure& callback) {
-  callback.Run();
-}
-
-void NullExtensionCache::AllowCaching(const std::string& id) {
-}
-
-bool NullExtensionCache::GetExtension(const std::string& id,
-                                      base::FilePath* file_path,
-                                      std::string* version) {
-  return false;
-}
-
-void NullExtensionCache::PutExtension(const std::string& id,
-                                      const base::FilePath& file_path,
-                                      const std::string& version,
-                                      const PutExtensionCallback& callback) {
-  callback.Run(file_path, true);
-}
-
-}  // namespace extensions
diff --git a/extensions/browser/updater/null_extension_cache.h b/extensions/browser/updater/null_extension_cache.h
deleted file mode 100644
index c4c9a1b..0000000
--- a/extensions/browser/updater/null_extension_cache.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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_UPDATER_NULL_EXTENSION_CACHE_H_
-#define EXTENSIONS_BROWSER_UPDATER_NULL_EXTENSION_CACHE_H_
-
-#include "extensions/browser/updater/extension_cache.h"
-
-namespace extensions {
-
-// Implements a pass-thru (i.e. do-nothing) ExtensionCache.
-class NullExtensionCache : public ExtensionCache {
- public:
-  NullExtensionCache();
-  virtual ~NullExtensionCache();
-
-  // ExtensionCache implementation.
-  virtual void Start(const base::Closure& callback) override;
-  virtual void Shutdown(const base::Closure& callback) override;
-  virtual void AllowCaching(const std::string& id) override;
-  virtual bool GetExtension(const std::string& id,
-                            base::FilePath* file_path,
-                            std::string* version) override;
-  virtual void PutExtension(const std::string& id,
-                            const base::FilePath& file_path,
-                            const std::string& version,
-                            const PutExtensionCallback& callback) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NullExtensionCache);
-};
-
-}  // namespace extensions
-
-#endif  // EXTENSIONS_BROWSER_UPDATER_NULL_EXTENSION_CACHE_H_