Move ExtensionUnpacker into extensions:: namespace, rename it to Unpacker

chrome/browser/extensions/sandboxed_unpacker_unittest.cc

 // 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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/extension_unpacker.h"
+#include "chrome/common/extensions/unpacker.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 using content::BrowserThread;
 using testing::_;
@@ skipping 59 matching lines @@
     ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value();
 
     // Try bots won't let us write into DIR_TEST_DATA, so we have to write the
     // CRX to the temp directory, and create a subdirectory into which to
     // unpack it.
     FilePath crx_path = temp_dir_.path().AppendASCII(crx_name);
     ASSERT_TRUE(file_util::CopyFile(original_path, crx_path)) <<
         "Original path: " << original_path.value() <<
         ", Crx path: " << crx_path.value();
 
-    unpacker_.reset(new ExtensionUnpacker(
+    unpacker_.reset(new Unpacker(
         crx_path, std::string(), Extension::INTERNAL, Extension::NO_FLAGS));
 
     // Build a temp area where the extension will be unpacked.
     temp_path_ =
         temp_dir_.path().AppendASCII("sandboxed_unpacker_test_Temp");
     ASSERT_TRUE(file_util::CreateDirectory(temp_path_));
 
     sandboxed_unpacker_ =
         new SandboxedUnpacker(crx_path, false, Extension::INTERNAL,
                               Extension::NO_FLAGS, client_);
@@ skipping 46 matching lines @@
         << "File was not removed on success.";
       item_in_temp = temp_iterator.Next();
     }
     return (items_not_removed == 0);
   }
 
  protected:
   ScopedTempDir temp_dir_;
   FilePath temp_path_;
   MockSandboxedUnpackerClient* client_;
-  scoped_ptr<ExtensionUnpacker> unpacker_;
+  scoped_ptr<Unpacker> unpacker_;
   scoped_refptr<SandboxedUnpacker> sandboxed_unpacker_;
   MessageLoop loop_;
   scoped_ptr<content::TestBrowserThread> file_thread_;
 };
 
 TEST_F(SandboxedUnpackerTest, NoCatalogsSuccess) {
   EXPECT_CALL(*client_, OnUnpackSuccess(_, _, _, _));
   EXPECT_CALL(*client_, OnUnpackFailure(_)).Times(0);
 
   SetupUnpacker("no_l10n.crx");
@@ skipping 41 matching lines @@
   // Check that there is newer _locales/en_US/messages.json file.
   base::PlatformFileInfo new_info;
   EXPECT_TRUE(file_util::GetFileInfo(messages_file, &new_info));
 
   EXPECT_TRUE(new_info.last_modified > old_info.last_modified);
 
   ASSERT_TRUE(TempFilesRemoved());
 }
 
 }  // namespace extensions