chrome/browser/importer/firefox_importer_browsertest.cc - Issue 18501013: Move most importer code to chrome/utility/importer

Side by Side Diff: chrome/browser/importer/firefox_importer_browsertest.cc

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/importer/firefox3_importer.cc ('k') | chrome/browser/importer/firefox_importer_unittest.cc » ('j') | chrome/utility/importer/safari_importer_unittest.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/file_util.h"	5 #include "base/file_util.h"

6 #include "base/files/file_path.h"	6 #include "base/files/file_path.h"

7 #include "base/files/scoped_temp_dir.h"	7 #include "base/files/scoped_temp_dir.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

9 #include "base/path_service.h"	9 #include "base/path_service.h"

10 #include "base/stl_util.h"	10 #include "base/stl_util.h"

11 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "chrome/browser/importer/external_process_importer_host.h"	14 #include "chrome/browser/importer/external_process_importer_host.h"

15 #include "chrome/browser/importer/firefox_importer_unittest_utils.h"

16 #include "chrome/browser/importer/importer_progress_observer.h"	15 #include "chrome/browser/importer/importer_progress_observer.h"

17 #include "chrome/browser/importer/importer_unittest_utils.h"	16 #include "chrome/browser/importer/importer_unittest_utils.h"

18 #include "chrome/browser/search_engines/template_url.h"	17 #include "chrome/browser/search_engines/template_url.h"

19 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

20 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

21 #include "chrome/common/importer/imported_bookmark_entry.h"	20 #include "chrome/common/importer/imported_bookmark_entry.h"

22 #include "chrome/common/importer/imported_favicon_usage.h"	21 #include "chrome/common/importer/imported_favicon_usage.h"

23 #include "chrome/common/importer/importer_data_types.h"	22 #include "chrome/common/importer/importer_data_types.h"

24 #include "chrome/test/base/in_process_browser_test.h"	23 #include "chrome/test/base/in_process_browser_test.h"

25 #include "content/public/common/password_form.h"	24 #include "content/public/common/password_form.h"

(...skipping 264 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 }	289 }

291	290

292 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,	291 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,

293 MAYBE_IMPORTER(Firefox35Importer)) {	292 MAYBE_IMPORTER(Firefox35Importer)) {

294 bool import_search_engines = false;	293 bool import_search_engines = false;

295 scoped_refptr<Firefox3Observer> observer(	294 scoped_refptr<Firefox3Observer> observer(

296 new Firefox3Observer(import_search_engines));	295 new Firefox3Observer(import_search_engines));

297 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(),	296 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(),

298 observer.get(), import_search_engines);	297 observer.get(), import_search_engines);

299 }	298 }

OLD	NEW