Move importer files into an importer subdirectory.

chrome/browser/importer/mork_reader.h

 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 21 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Source:
 // http://mxr.mozilla.org/firefox/source/db/morkreader/nsMorkReader.h
 
-#ifndef MORK_READER_H__
-#define MORK_READER_H__
+#ifndef CHROME_BROWSER_IMPORTER_MORK_READER_H__
+#define CHROME_BROWSER_IMPORTER_MORK_READER_H__
 
 #include <map>
 #include <iostream>
 #include <fstream>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/stack_container.h"
-#include "chrome/browser/importer.h"
+#include "chrome/browser/importer/importer.h"
 
 // The nsMorkReader object allows a consumer to read in a mork-format
 // file and enumerate the rows that it contains.  It does not provide
 // any functionality for modifying mork tables.
 
 // References:
 //  http://www.mozilla.org/mailnews/arch/mork/primer.txt
 //  http://www.mozilla.org/mailnews/arch/mork/grammar.txt
 //  http://www.jwz.org/hacks/mork.pl
 
@@ skipping 91 matching lines @@
 
   // The contents of the mork database. This array pointer is owned by this
   // class and must be deleted.
   RowMap table_;
 };
 
 // ImportHistoryFromFirefox2 is the main entry point to the importer.
 void ImportHistoryFromFirefox2(std::wstring file, MessageLoop* loop,
                                ProfileWriter* writer);
 
-#endif  // MORK_READER_H__
+#endif  // CHROME_BROWSER_IMPORTER_MORK_READER_H__