[components] Make zip a component so that src/chromeos can use it.

components/zip/zip_reader_unittest.cc

 // Copyright (c) 2011 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 "chrome/common/zip_reader.h"
+#include "components/zip/zip_reader.h"
 
 #include <set>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/zip_internal.h"
+#include "components/zip/zip_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 // Wrap PlatformFiles in a class so that we don't leak them in tests.
 class PlatformFileWrapper {
  public:
   typedef enum {
     READ_ONLY,
@@ skipping 38 matching lines @@
 
 // Make the test a PlatformTest to setup autorelease pools properly on Mac.
 class ZipReaderTest : public PlatformTest {
  protected:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     test_dir_ = temp_dir_.path();
 
-    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
+    ASSERT_TRUE(GetTestDataDirectory(&test_data_dir_));
     test_data_dir_ = test_data_dir_.AppendASCII("zip");
 
     test_zip_file_ = test_data_dir_.AppendASCII("test.zip");
     evil_zip_file_ = test_data_dir_.AppendASCII("evil.zip");
     evil_via_invalid_utf8_zip_file_ = test_data_dir_.AppendASCII(
         "evil_via_invalid_utf8.zip");
     evil_via_absolute_file_name_zip_file_ = test_data_dir_.AppendASCII(
         "evil_via_absolute_file_name.zip");
 
     test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/")));
     test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/bar/")));
     test_zip_contents_.insert(
         base::FilePath(FILE_PATH_LITERAL("foo/bar/baz.txt")));
     test_zip_contents_.insert(
         base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")));
     test_zip_contents_.insert(
         base::FilePath(FILE_PATH_LITERAL("foo/bar.txt")));
     test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo.txt")));
     test_zip_contents_.insert(
         base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")));
   }
 
   virtual void TearDown() {
     PlatformTest::TearDown();
   }
 
+  bool GetTestDataDirectory(base::FilePath* path) {
+    bool success = PathService::Get(base::DIR_SOURCE_ROOT, path);
+    EXPECT_TRUE(success);
+    if (!success)
+      return false;
+    *path = path->AppendASCII("components");
+    *path = path->AppendASCII("test");
+    *path = path->AppendASCII("data");
+    return true;
+  }
+
   // The path to temporary directory used to contain the test operations.
   base::FilePath test_dir_;
   // The path to the test data directory where test.zip etc. are located.
   base::FilePath test_data_dir_;
   // The path to test.zip in the test data directory.
   base::FilePath test_zip_file_;
   // The path to evil.zip in the test data directory.
   base::FilePath evil_zip_file_;
   // The path to evil_via_invalid_utf8.zip in the test data directory.
   base::FilePath evil_via_invalid_utf8_zip_file_;
@@ skipping 296 matching lines @@
   ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
       test_dir_.AppendASCII("test.txt")));
 
   std::string actual;
   ASSERT_TRUE(file_util::ReadFileToString(
       test_dir_.AppendASCII("test.txt"), &actual));
   EXPECT_EQ(std::string("This is a test.\n"), actual);
 }
 
 }  // namespace zip