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

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

Issue 2296633002: Fix Firefox bookmarks import. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 4 years 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 | chrome/common/importer/mock_importer_bridge.h » ('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 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 20 matching lines...) Expand all
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 32
33 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007 33 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007
34 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688 34 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
35 #if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) 35 #if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64))
36 #define MAYBE_IMPORTER(x) DISABLED_##x 36 #define MAYBE_IMPORTER(x) DISABLED_##x
37 #else 37 #else
38 #define MAYBE_IMPORTER(x) x 38 #define MAYBE_IMPORTER(x) x
39 #endif 39 #endif
40 40
41 // TODO(kszatan): Disabled all tests on old profiles. http://crbug.com/592239
42 #undef MAYBE_IMPORTER
43 #define MAYBE_IMPORTER(x) DISABLED_##x
44
41 namespace { 45 namespace {
42 46
43 struct PasswordInfo { 47 struct PasswordInfo {
44 const char* origin; 48 const char* origin;
45 const char* action; 49 const char* action;
46 const char* realm; 50 const char* realm;
47 const char* username_element; 51 const char* username_element;
48 const char* username; 52 const char* username;
49 const char* password_element; 53 const char* password_element;
50 const char* password; 54 const char* password;
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true)); 358 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true));
355 FirefoxImporterBrowserTest("firefox_profile", observer.get(), observer.get()); 359 FirefoxImporterBrowserTest("firefox_profile", observer.get(), observer.get());
356 } 360 }
357 361
358 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, 362 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
359 MAYBE_IMPORTER(Firefox320Importer)) { 363 MAYBE_IMPORTER(Firefox320Importer)) {
360 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true)); 364 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true));
361 FirefoxImporterBrowserTest("firefox320_profile", observer.get(), 365 FirefoxImporterBrowserTest("firefox320_profile", observer.get(),
362 observer.get()); 366 observer.get());
363 } 367 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/importer/mock_importer_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698