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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 2113433002: Comment out frequently flaky PrivateStore test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« 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 (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 <memory> 5 #include <memory>
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/desktop_background/desktop_background_controller_observer.h" 9 #include "ash/desktop_background/desktop_background_controller_observer.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 2279 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 Profile* app_profile = ProfileManager::GetPrimaryUserProfile(); 2290 Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
2291 ASSERT_TRUE(app_profile); 2291 ASSERT_TRUE(app_profile);
2292 EXPECT_FALSE( 2292 EXPECT_FALSE(
2293 SigninManagerFactory::GetForProfile(app_profile)->IsAuthenticated()); 2293 SigninManagerFactory::GetForProfile(app_profile)->IsAuthenticated());
2294 2294
2295 // Terminate the app. 2295 // Terminate the app.
2296 window->GetBaseWindow()->Close(); 2296 window->GetBaseWindow()->Close();
2297 content::RunAllPendingInMessageLoop(); 2297 content::RunAllPendingInMessageLoop();
2298 } 2298 }
2299 2299
2300 IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, PrivateStore) { 2300 #if defined(OS_CHROMEOS)
2301 #define MAYBE_PrivateStore DISABLED_PrivateStore
2302 #else
2303 #define MAYBE_PrivateStore PrivateStore
2304 #endif
2305 IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, MAYBE_PrivateStore) {
2301 set_test_app_id(kTestEnterpriseKioskApp); 2306 set_test_app_id(kTestEnterpriseKioskApp);
2302 2307
2303 const char kPrivateStoreUpdate[] = "/private_store_update"; 2308 const char kPrivateStoreUpdate[] = "/private_store_update";
2304 net::EmbeddedTestServer private_server; 2309 net::EmbeddedTestServer private_server;
2305 ASSERT_TRUE(private_server.Start()); 2310 ASSERT_TRUE(private_server.Start());
2306 2311
2307 // |private_server| serves crx from test data dir. 2312 // |private_server| serves crx from test data dir.
2308 base::FilePath test_data_dir; 2313 base::FilePath test_data_dir;
2309 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); 2314 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
2310 private_server.ServeFilesFromDirectory(test_data_dir); 2315 private_server.ServeFilesFromDirectory(test_data_dir);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 content::WindowedNotificationObserver( 2415 content::WindowedNotificationObserver(
2411 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2416 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2412 content::NotificationService::AllSources()).Wait(); 2417 content::NotificationService::AllSources()).Wait();
2413 2418
2414 // Wait for the wallpaper to load. 2419 // Wait for the wallpaper to load.
2415 WaitForWallpaper(); 2420 WaitForWallpaper();
2416 EXPECT_TRUE(wallpaper_loaded()); 2421 EXPECT_TRUE(wallpaper_loaded());
2417 } 2422 }
2418 2423
2419 } // namespace chromeos 2424 } // namespace chromeos
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