| Index: chrome/common/importer/importer_data_types.h | 
| diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h | 
| similarity index 84% | 
| rename from chrome/browser/importer/importer_data_types.h | 
| rename to chrome/common/importer/importer_data_types.h | 
| index eae32a8011bf738d410df1e8b787598401d1088d..e7671f9791de801b1c6cab5104d08effe1ad918c 100644 | 
| --- a/chrome/browser/importer/importer_data_types.h | 
| +++ b/chrome/common/importer/importer_data_types.h | 
| @@ -1,56 +1,56 @@ | 
| -// 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. | 
| - | 
| -#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
| -#define CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
| - | 
| -#include <string> | 
| - | 
| -#include "base/basictypes.h" | 
| -#include "base/files/file_path.h" | 
| -#include "base/memory/ref_counted.h" | 
| -#include "base/strings/string16.h" | 
| -#include "chrome/browser/importer/importer_type.h" | 
| -#include "url/gurl.h" | 
| - | 
| -// Types needed for importing data from other browsers and the Google Toolbar. | 
| -namespace importer { | 
| - | 
| -// An enumeration of the type of data that can be imported. | 
| -enum ImportItem { | 
| -  NONE           = 0, | 
| -  HISTORY        = 1 << 0, | 
| -  FAVORITES      = 1 << 1, | 
| -  COOKIES        = 1 << 2,  // Not supported yet. | 
| -  PASSWORDS      = 1 << 3, | 
| -  SEARCH_ENGINES = 1 << 4, | 
| -  HOME_PAGE      = 1 << 5, | 
| -  ALL            = (1 << 6) - 1  // All the bits should be 1, hence the -1. | 
| -}; | 
| - | 
| -// Information about a profile needed by an importer to do import work. | 
| -struct SourceProfile { | 
| -  SourceProfile(); | 
| -  ~SourceProfile(); | 
| - | 
| -  string16 importer_name; | 
| -  ImporterType importer_type; | 
| -  base::FilePath source_path; | 
| -  base::FilePath app_path; | 
| -  uint16 services_supported;  // Bitmask of ImportItem. | 
| -  // The application locale. Stored because we can only access it from the UI | 
| -  // thread on the browser process. This is only used by the Firefox importer. | 
| -  std::string locale; | 
| -}; | 
| - | 
| -// Contains information needed for importing bookmarks/search engine urls, etc. | 
| -struct URLKeywordInfo { | 
| -  GURL url; | 
| -  string16 keyword; | 
| -  string16 display_name; | 
| -}; | 
| - | 
| -}  // namespace importer | 
| - | 
| -#endif  // CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
| +// 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. | 
| + | 
| +#ifndef CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
| +#define CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
| + | 
| +#include <string> | 
| + | 
| +#include "base/basictypes.h" | 
| +#include "base/files/file_path.h" | 
| +#include "base/memory/ref_counted.h" | 
| +#include "base/strings/string16.h" | 
| +#include "chrome/common/importer/importer_type.h" | 
| +#include "url/gurl.h" | 
| + | 
| +// Types needed for importing data from other browsers and the Google Toolbar. | 
| +namespace importer { | 
| + | 
| +// An enumeration of the type of data that can be imported. | 
| +enum ImportItem { | 
| +  NONE           = 0, | 
| +  HISTORY        = 1 << 0, | 
| +  FAVORITES      = 1 << 1, | 
| +  COOKIES        = 1 << 2,  // Not supported yet. | 
| +  PASSWORDS      = 1 << 3, | 
| +  SEARCH_ENGINES = 1 << 4, | 
| +  HOME_PAGE      = 1 << 5, | 
| +  ALL            = (1 << 6) - 1  // All the bits should be 1, hence the -1. | 
| +}; | 
| + | 
| +// Information about a profile needed by an importer to do import work. | 
| +struct SourceProfile { | 
| +  SourceProfile(); | 
| +  ~SourceProfile(); | 
| + | 
| +  string16 importer_name; | 
| +  ImporterType importer_type; | 
| +  base::FilePath source_path; | 
| +  base::FilePath app_path; | 
| +  uint16 services_supported;  // Bitmask of ImportItem. | 
| +  // The application locale. Stored because we can only access it from the UI | 
| +  // thread on the browser process. This is only used by the Firefox importer. | 
| +  std::string locale; | 
| +}; | 
| + | 
| +// Contains information needed for importing bookmarks/search engine urls, etc. | 
| +struct URLKeywordInfo { | 
| +  GURL url; | 
| +  string16 keyword; | 
| +  string16 display_name; | 
| +}; | 
| + | 
| +}  // namespace importer | 
| + | 
| +#endif  // CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ | 
|  |