Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

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

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another gyp attempt 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
OLDNEW
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 // The order of these includes is important. 5 // The order of these includes is important.
6 #include <windows.h> 6 #include <windows.h>
7 #include <unknwn.h> 7 #include <unknwn.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <propvarutil.h> 9 #include <propvarutil.h>
10 #include <shlguid.h> 10 #include <shlguid.h>
(...skipping 11 matching lines...) Expand all
22 #include "base/path_service.h" 22 #include "base/path_service.h"
23 #include "base/stl_util.h" 23 #include "base/stl_util.h"
24 #include "base/strings/string16.h" 24 #include "base/strings/string16.h"
25 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
26 #include "base/strings/utf_string_conversions.h" 26 #include "base/strings/utf_string_conversions.h"
27 #include "base/win/registry.h" 27 #include "base/win/registry.h"
28 #include "base/win/scoped_comptr.h" 28 #include "base/win/scoped_comptr.h"
29 #include "base/win/scoped_propvariant.h" 29 #include "base/win/scoped_propvariant.h"
30 #include "base/win/windows_version.h" 30 #include "base/win/windows_version.h"
31 #include "chrome/browser/importer/external_process_importer_host.h" 31 #include "chrome/browser/importer/external_process_importer_host.h"
32 #include "chrome/browser/importer/ie_importer.h"
33 #include "chrome/browser/importer/ie_importer_test_registry_overrider_win.h"
34 #include "chrome/browser/importer/ie_importer_utils_win.h"
35 #include "chrome/browser/importer/importer_bridge.h"
36 #include "chrome/browser/importer/importer_progress_observer.h" 32 #include "chrome/browser/importer/importer_progress_observer.h"
37 #include "chrome/browser/importer/importer_unittest_utils.h" 33 #include "chrome/browser/importer/importer_unittest_utils.h"
38 #include "chrome/browser/importer/pstore_declarations.h"
39 #include "chrome/browser/search_engines/template_url.h" 34 #include "chrome/browser/search_engines/template_url.h"
40 #include "chrome/browser/ui/browser.h" 35 #include "chrome/browser/ui/browser.h"
41 #include "chrome/common/chrome_paths.h" 36 #include "chrome/common/chrome_paths.h"
37 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
38 #include "chrome/common/importer/ie_importer_utils_win.h"
42 #include "chrome/common/importer/imported_bookmark_entry.h" 39 #include "chrome/common/importer/imported_bookmark_entry.h"
43 #include "chrome/common/importer/imported_favicon_usage.h" 40 #include "chrome/common/importer/imported_favicon_usage.h"
41 #include "chrome/common/importer/importer_bridge.h"
44 #include "chrome/common/importer/importer_data_types.h" 42 #include "chrome/common/importer/importer_data_types.h"
43 #include "chrome/common/importer/pstore_declarations.h"
45 #include "chrome/test/base/in_process_browser_test.h" 44 #include "chrome/test/base/in_process_browser_test.h"
46 #include "chrome/test/base/testing_profile.h" 45 #include "chrome/test/base/testing_profile.h"
47 #include "components/webdata/encryptor/ie7_password.h" 46 #include "components/webdata/encryptor/ie7_password.h"
48 #include "content/public/common/password_form.h" 47 #include "content/public/common/password_form.h"
49 #include "testing/gtest/include/gtest/gtest.h" 48 #include "testing/gtest/include/gtest/gtest.h"
50 49
51 namespace { 50 namespace {
52 51
53 const BookmarkInfo kIEBookmarks[] = { 52 const BookmarkInfo kIEBookmarks[] = {
54 {true, 2, {L"Links", L"SubFolderOfLinks"}, 53 {true, 2, {L"Links", L"SubFolderOfLinks"},
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 source_profile.source_path = temp_dir_.path(); 665 source_profile.source_path = temp_dir_.path();
667 666
668 host->StartImportSettings( 667 host->StartImportSettings(
669 source_profile, 668 source_profile,
670 browser()->profile(), 669 browser()->profile(),
671 importer::HOME_PAGE, 670 importer::HOME_PAGE,
672 observer); 671 observer);
673 base::MessageLoop::current()->Run(); 672 base::MessageLoop::current()->Run();
674 } 673 }
675 674
OLDNEW
« no previous file with comments | « chrome/browser/importer/ie_importer.cc ('k') | chrome/browser/importer/ie_importer_test_registry_overrider_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698