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

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

Issue 200713005: components: Rename encryptor directory to os_crypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/DEPS ('k') | chrome/browser/importer/in_process_importer_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
37 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h" 37 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
38 #include "chrome/common/importer/ie_importer_utils_win.h" 38 #include "chrome/common/importer/ie_importer_utils_win.h"
39 #include "chrome/common/importer/imported_bookmark_entry.h" 39 #include "chrome/common/importer/imported_bookmark_entry.h"
40 #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" 41 #include "chrome/common/importer/importer_bridge.h"
42 #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" 43 #include "chrome/common/importer/pstore_declarations.h"
44 #include "chrome/test/base/in_process_browser_test.h" 44 #include "chrome/test/base/in_process_browser_test.h"
45 #include "chrome/test/base/testing_profile.h" 45 #include "chrome/test/base/testing_profile.h"
46 #include "components/autofill/core/common/password_form.h" 46 #include "components/autofill/core/common/password_form.h"
47 #include "components/encryptor/ie7_password_win.h" 47 #include "components/os_crypt/ie7_password_win.h"
48 #include "testing/gtest/include/gtest/gtest.h" 48 #include "testing/gtest/include/gtest/gtest.h"
49 49
50 namespace { 50 namespace {
51 51
52 const BookmarkInfo kIEBookmarks[] = { 52 const BookmarkInfo kIEBookmarks[] = {
53 {true, 2, {L"Links", L"SubFolderOfLinks"}, 53 {true, 2, {L"Links", L"SubFolderOfLinks"},
54 L"SubLink", 54 L"SubLink",
55 "http://www.links-sublink.com/"}, 55 "http://www.links-sublink.com/"},
56 {true, 1, {L"Links"}, 56 {true, 1, {L"Links"},
57 L"TheLink", 57 L"TheLink",
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 source_profile.source_path = temp_dir_.path(); 668 source_profile.source_path = temp_dir_.path();
669 669
670 host->StartImportSettings( 670 host->StartImportSettings(
671 source_profile, 671 source_profile,
672 browser()->profile(), 672 browser()->profile(),
673 importer::HOME_PAGE, 673 importer::HOME_PAGE,
674 observer); 674 observer);
675 base::MessageLoop::current()->Run(); 675 base::MessageLoop::current()->Run();
676 } 676 }
677 677
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/importer/in_process_importer_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698