Move most importer code to chrome/utility/importer

chrome/utility/importer/firefox_importer_unittest_utils_mac.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 "chrome/browser/importer/firefox_importer_unittest_utils.h"
+#include "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
-#include "chrome/browser/importer/firefox_importer_utils.h"
+#include "chrome/common/importer/firefox_importer_utils.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_multiprocess_test.h"
 #include "ipc/ipc_switches.h"
 #include "testing/multiprocess_func_list.h"
 
 #define IPC_MESSAGE_IMPL
-#include "chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
+#include "chrome/utility/importer/firefox_importer_unittest_messages_internal.h"
 
 namespace {
 
 // Name of IPC Channel to use for Server<-> Child Communications.
 const char kTestChannelID[] = "T1";
 
 // Launch the child process:
 // |nss_path| - path to the NSS directory holding the decryption libraries.
 // |channel| - IPC Channel to use for communication.
 // |handle| - On return, the process handle to use to communicate with the
 // child.
 bool LaunchNSSDecrypterChildProcess(const base::FilePath& nss_path,
     IPC::Channel* channel, base::ProcessHandle* handle) {
   CommandLine cl(*CommandLine::ForCurrentProcess());
   cl.AppendSwitchASCII(switches::kTestChildProcess, "NSSDecrypterChildProcess");
 
   // Set env variable needed for FF encryption libs to load.
-  // See "chrome/browser/importer/nss_decryptor_mac.mm" for an explanation of
+  // See "chrome/utility/importer/nss_decryptor_mac.mm" for an explanation of
   // why we need this.
   base::EnvironmentVector env;
   std::pair<std::string, std::string> dyld_override;
   dyld_override.first = "DYLD_FALLBACK_LIBRARY_PATH";
   dyld_override.second = nss_path.value();
   env.push_back(dyld_override);
 
   int ipcfd = channel->TakeClientFileDescriptor();
   if (ipcfd == -1)
     return false;
@@ skipping 218 matching lines @@
 
   IPC::Channel channel(kTestChannelID, IPC::Channel::MODE_CLIENT, &listener);
   CHECK(channel.Connect());
   listener.SetSender(&channel);
 
   // run message loop
   base::MessageLoop::current()->Run();
 
   return 0;
 }