OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 // to trigger the interaction being tested. | 184 // to trigger the interaction being tested. |
185 extern const char kImportBookmarksFile[] = | 185 extern const char kImportBookmarksFile[] = |
186 "{\n" | 186 "{\n" |
187 " \"distribution\": {\n" | 187 " \"distribution\": {\n" |
188 " \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n" | 188 " \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n" |
189 " }\n" | 189 " }\n" |
190 "}\n"; | 190 "}\n"; |
191 typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile> | 191 typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile> |
192 FirstRunMasterPrefsImportBookmarksFile; | 192 FirstRunMasterPrefsImportBookmarksFile; |
193 // http://crbug.com/314221 | 193 // http://crbug.com/314221 |
194 #if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX)) | 194 #if (defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX)) || defined(OS_MACOSX) |
195 #define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile | 195 #define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile |
196 #else | 196 #else |
197 #define MAYBE_ImportBookmarksFile ImportBookmarksFile | 197 #define MAYBE_ImportBookmarksFile ImportBookmarksFile |
198 #endif | 198 #endif |
199 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile, | 199 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile, |
200 MAYBE_ImportBookmarksFile) { | 200 MAYBE_ImportBookmarksFile) { |
201 int auto_import_state = first_run::auto_import_state(); | 201 int auto_import_state = first_run::auto_import_state(); |
202 EXPECT_EQ( | 202 EXPECT_EQ( |
203 MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED | | 203 MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED | |
204 first_run::AUTO_IMPORT_PROFILE_IMPORTED | | 204 first_run::AUTO_IMPORT_PROFILE_IMPORTED | |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 FirstRunMasterPrefsWithTrackedPreferences, | 288 FirstRunMasterPrefsWithTrackedPreferences, |
289 testing::Values( | 289 testing::Values( |
290 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement, | 290 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement, |
291 chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways, | 291 chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways, |
292 chrome_prefs::internals:: | 292 chrome_prefs::internals:: |
293 kSettingsEnforcementGroupEnforceAlwaysWithDSE, | 293 kSettingsEnforcementGroupEnforceAlwaysWithDSE, |
294 chrome_prefs::internals:: | 294 chrome_prefs::internals:: |
295 kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE)); | 295 kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE)); |
296 | 296 |
297 #endif // !defined(OS_CHROMEOS) | 297 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |