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

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

Issue 2903573003: Revert of disable EdgeImporterBrowserTest.EdgeImporter test. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // This will launch the browser test and thus needs to happen last. 150 // This will launch the browser test and thus needs to happen last.
151 InProcessBrowserTest::SetUp(); 151 InProcessBrowserTest::SetUp();
152 } 152 }
153 153
154 base::ScopedTempDir temp_dir_; 154 base::ScopedTempDir temp_dir_;
155 155
156 // Overrides the default registry key for Edge tests. 156 // Overrides the default registry key for Edge tests.
157 ImporterTestRegistryOverrider test_registry_overrider_; 157 ImporterTestRegistryOverrider test_registry_overrider_;
158 }; 158 };
159 159
160 IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, DISABLED_EdgeImporter) { 160 IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, EdgeImporter) {
161 // Only verified to work with ESE library on Windows 8.1 and above. 161 // Only verified to work with ESE library on Windows 8.1 and above.
162 if (base::win::GetVersion() < base::win::VERSION_WIN8_1) 162 if (base::win::GetVersion() < base::win::VERSION_WIN8_1)
163 return; 163 return;
164 164
165 const BookmarkInfo kEdgeBookmarks[] = { 165 const BookmarkInfo kEdgeBookmarks[] = {
166 {true, 166 {true,
167 2, 167 2,
168 {"Links", "SubFolderOfLinks"}, 168 {"Links", "SubFolderOfLinks"},
169 L"SubLink", 169 L"SubLink",
170 "http://www.links-sublink.com/"}, 170 "http://www.links-sublink.com/"},
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 host->set_observer(observer.get()); 299 host->set_observer(observer.get());
300 300
301 importer::SourceProfile source_profile; 301 importer::SourceProfile source_profile;
302 source_profile.importer_type = importer::TYPE_EDGE; 302 source_profile.importer_type = importer::TYPE_EDGE;
303 source_profile.source_path = temp_dir_.GetPath(); 303 source_profile.source_path = temp_dir_.GetPath();
304 304
305 host->StartImportSettings(source_profile, browser()->profile(), 305 host->StartImportSettings(source_profile, browser()->profile(),
306 importer::FAVORITES, observer.get()); 306 importer::FAVORITES, observer.get());
307 base::RunLoop().Run(); 307 base::RunLoop().Run();
308 } 308 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698