Move CrxFile, FileReader, ExtensionResource to src/extensions.

extensions/browser/file_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "chrome/browser/extensions/file_reader.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_resource.h"
-#include "chrome/common/extensions/extension_test_util.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/file_reader.h"
+#include "extensions/common/extension_resource.h"
+#include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class FileReaderTest : public testing::Test {
  public:
   FileReaderTest() : file_thread_(BrowserThread::FILE) {
     file_thread_.Start();
@@ skipping 22 matching lines @@
     MessageLoop::current()->Quit();
   }
 
   bool succeeded_;
   std::string data_;
 };
 
 void RunBasicTest(const char* filename) {
   base::FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
-  std::string extension_id = extension_test_util::MakeId("test");
-  ExtensionResource resource(extension_id, path,
-                             base::FilePath().AppendASCII(filename));
+  std::string extension_id = extensions::id_util::GenerateId("test");
+  extensions::ExtensionResource resource(
+      extension_id, path, base::FilePath().AppendASCII(filename));
   path = path.AppendASCII(filename);
 
   std::string file_contents;
   bool file_exists = file_util::ReadFileToString(path, &file_contents);
 
   Receiver receiver;
 
   scoped_refptr<FileReader> file_reader(
       new FileReader(resource, receiver.NewCallback()));
   file_reader->Start();
 
   MessageLoop::current()->Run();
 
   EXPECT_EQ(file_exists, receiver.succeeded());
   EXPECT_EQ(file_contents, receiver.data());
 }
 
 TEST_F(FileReaderTest, SmallFile) {
   RunBasicTest("title1.html");
 }
 
 TEST_F(FileReaderTest, BiggerFile) {
   RunBasicTest("download-test1.lib");
 }
 
 TEST_F(FileReaderTest, NonExistantFile) {
   base::FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
-  std::string extension_id = extension_test_util::MakeId("test");
-  ExtensionResource resource(extension_id, path, base::FilePath(
+  std::string extension_id = extensions::id_util::GenerateId("test");
+  extensions::ExtensionResource resource(extension_id, path, base::FilePath(
       FILE_PATH_LITERAL("file_that_does_not_exist")));
   path = path.AppendASCII("file_that_does_not_exist");
 
   Receiver receiver;
 
   scoped_refptr<FileReader> file_reader(
       new FileReader(resource, receiver.NewCallback()));
   file_reader->Start();
 
   MessageLoop::current()->Run();
 
   EXPECT_FALSE(receiver.succeeded());
 }
 
 }  // namespace