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

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

Issue 18555005: Move importer messages to common (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
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 #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" 15 #include "chrome/browser/importer/firefox_importer_unittest_utils.h"
16 #include "chrome/browser/importer/importer_data_types.h"
17 #include "chrome/browser/importer/importer_host.h" 16 #include "chrome/browser/importer/importer_host.h"
18 #include "chrome/browser/importer/importer_progress_observer.h" 17 #include "chrome/browser/importer/importer_progress_observer.h"
19 #include "chrome/browser/importer/importer_unittest_utils.h" 18 #include "chrome/browser/importer/importer_unittest_utils.h"
20 #include "chrome/browser/search_engines/template_url.h" 19 #include "chrome/browser/search_engines/template_url.h"
21 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
22 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/importer/imported_bookmark_entry.h" 22 #include "chrome/common/importer/imported_bookmark_entry.h"
24 #include "chrome/common/importer/imported_favicon_usage.h" 23 #include "chrome/common/importer/imported_favicon_usage.h"
24 #include "chrome/common/importer/importer_data_types.h"
25 #include "chrome/test/base/in_process_browser_test.h" 25 #include "chrome/test/base/in_process_browser_test.h"
26 #include "content/public/common/password_form.h" 26 #include "content/public/common/password_form.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 28
29 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007 29 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007
30 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688 30 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
31 #if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) 31 #if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64))
32 #define MAYBE_IMPORTER(x) DISABLED_##x 32 #define MAYBE_IMPORTER(x) DISABLED_##x
33 #else 33 #else
34 #define MAYBE_IMPORTER(x) x 34 #define MAYBE_IMPORTER(x) x
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 } 291 }
292 292
293 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, 293 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
294 MAYBE_IMPORTER(Firefox35Importer)) { 294 MAYBE_IMPORTER(Firefox35Importer)) {
295 bool import_search_engines = false; 295 bool import_search_engines = false;
296 scoped_refptr<Firefox3Observer> observer( 296 scoped_refptr<Firefox3Observer> observer(
297 new Firefox3Observer(import_search_engines)); 297 new Firefox3Observer(import_search_engines));
298 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(), 298 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(),
299 observer.get(), import_search_engines); 299 observer.get(), import_search_engines);
300 } 300 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/external_process_importer_host.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698