Revert r63919 "Part 2 of immutable Extension refactor."

Compile failure on Linux x64.

BUG=56558
TEST=no functional change
TBR=aa

Review URL: http://codereview.chromium.org/4156002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
index d5f88d4..cffa963 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
@@ -53,7 +53,7 @@ class BookmarkAPIEventTask : public Task {
      done_->Signal();
    }
  private:
-  scoped_refptr<Extension> extension_;
+  scoped_ptr<Extension> extension_;
   scoped_refptr<FunctionType> function_;
   size_t repeats_;
   base::WaitableEvent* done_;
@@ -68,12 +68,13 @@ class BookmarkAPIEventGenerator {
   template <class T>
   void NewEvent(const FilePath::StringType& extension_path,
       T* bookmarks_function, size_t repeats) {
+    FilePath path(extension_path);
+    Extension* extension = new Extension(path);
     std::string error;
     DictionaryValue input;
     input.SetString(keys::kVersion, kTestExtensionVersion);
     input.SetString(keys::kName, kTestExtensionName);
-    scoped_refptr<Extension> extension(Extension::Create(
-        FilePath(extension_path), Extension::INVALID, input, false, &error));
+    extension->InitFromValue(input, false, &error);
     bookmarks_function->set_name(T::function_name());
     base::WaitableEvent done_event(false, false);
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ -127,13 +128,14 @@ class ExtensionsActivityMonitorTest : public testing::Test {
   static std::string GetExtensionIdForPath(
       const FilePath::StringType& extension_path) {
     std::string error;
+    FilePath path(extension_path);
+    Extension e(path);
     DictionaryValue input;
     input.SetString(keys::kVersion, kTestExtensionVersion);
     input.SetString(keys::kName, kTestExtensionName);
-    scoped_refptr<Extension> extension(Extension::Create(
-        FilePath(extension_path), Extension::INVALID, input, false, &error));
+    e.InitFromValue(input, false, &error);
     EXPECT_EQ("", error);
-    return extension->id();
+    return e.id();
   }
  private:
   NotificationService* service_;