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

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

Issue 65163003: Move GetWebstoreLaunchURL and GetWebstoreItemDetailURLPrefix to extensions/common/extension_urls.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mt Created 7 years, 1 month 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 "apps/shell_window.h" 5 #include "apps/shell_window.h"
6 #include "apps/shell_window_registry.h" 6 #include "apps/shell_window_registry.h"
7 #include "apps/ui/native_app_window.h" 7 #include "apps/ui/native_app_window.h"
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/test/base/in_process_browser_test.h" 53 #include "chrome/test/base/in_process_browser_test.h"
54 #include "chrome/test/base/interactive_test_utils.h" 54 #include "chrome/test/base/interactive_test_utils.h"
55 #include "chrome/test/base/ui_test_utils.h" 55 #include "chrome/test/base/ui_test_utils.h"
56 #include "chromeos/chromeos_switches.h" 56 #include "chromeos/chromeos_switches.h"
57 #include "chromeos/settings/cros_settings_names.h" 57 #include "chromeos/settings/cros_settings_names.h"
58 #include "content/public/browser/notification_observer.h" 58 #include "content/public/browser/notification_observer.h"
59 #include "content/public/browser/notification_registrar.h" 59 #include "content/public/browser/notification_registrar.h"
60 #include "content/public/browser/notification_service.h" 60 #include "content/public/browser/notification_service.h"
61 #include "content/public/test/browser_test_utils.h" 61 #include "content/public/test/browser_test_utils.h"
62 #include "content/public/test/test_utils.h" 62 #include "content/public/test/test_utils.h"
63 #include "extensions/common/switches.h"
63 #include "google_apis/gaia/fake_gaia.h" 64 #include "google_apis/gaia/fake_gaia.h"
64 #include "google_apis/gaia/gaia_switches.h" 65 #include "google_apis/gaia/gaia_switches.h"
65 #include "net/base/network_change_notifier.h" 66 #include "net/base/network_change_notifier.h"
66 #include "net/dns/mock_host_resolver.h" 67 #include "net/dns/mock_host_resolver.h"
67 #include "net/test/embedded_test_server/embedded_test_server.h" 68 #include "net/test/embedded_test_server/embedded_test_server.h"
68 #include "net/test/embedded_test_server/http_request.h" 69 #include "net/test/embedded_test_server/http_request.h"
69 #include "net/test/embedded_test_server/http_response.h" 70 #include "net/test/embedded_test_server/http_response.h"
70 #include "testing/gmock/include/gmock/gmock.h" 71 #include "testing/gmock/include/gmock/gmock.h"
71 #include "testing/gtest/include/gtest/gtest.h" 72 #include "testing/gtest/include/gtest/gtest.h"
72 #include "ui/aura/window.h" 73 #include "ui/aura/window.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 command_line->AppendSwitchASCII(::switches::kGaiaUrl, gaia_url.spec()); 302 command_line->AppendSwitchASCII(::switches::kGaiaUrl, gaia_url.spec());
302 command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec()); 303 command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
303 command_line->AppendSwitchASCII(::switches::kGoogleApisUrl, 304 command_line->AppendSwitchASCII(::switches::kGoogleApisUrl,
304 gaia_url.spec()); 305 gaia_url.spec());
305 306
306 std::string webstore_host("webstore"); 307 std::string webstore_host("webstore");
307 GURL::Replacements replace_webstore_host; 308 GURL::Replacements replace_webstore_host;
308 replace_webstore_host.SetHostStr(webstore_host); 309 replace_webstore_host.SetHostStr(webstore_host);
309 GURL webstore_url = server_url.ReplaceComponents(replace_webstore_host); 310 GURL webstore_url = server_url.ReplaceComponents(replace_webstore_host);
310 command_line->AppendSwitchASCII( 311 command_line->AppendSwitchASCII(
311 ::switches::kAppsGalleryURL, 312 extensions::switches::kAppsGalleryURL,
312 webstore_url.Resolve("/chromeos/app_mode/webstore").spec()); 313 webstore_url.Resolve("/chromeos/app_mode/webstore").spec());
313 command_line->AppendSwitchASCII( 314 command_line->AppendSwitchASCII(
314 ::switches::kAppsGalleryDownloadURL, 315 ::switches::kAppsGalleryDownloadURL,
315 webstore_url.Resolve( 316 webstore_url.Resolve(
316 "/chromeos/app_mode/webstore/downloads/%s.crx").spec()); 317 "/chromeos/app_mode/webstore/downloads/%s.crx").spec());
317 } 318 }
318 319
319 void ReloadKioskApps() { 320 void ReloadKioskApps() {
320 KioskAppManager::Get()->AddApp(kTestKioskApp); 321 KioskAppManager::Get()->AddApp(kTestKioskApp);
321 } 322 }
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
964 content::WindowedNotificationObserver( 965 content::WindowedNotificationObserver(
965 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 966 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
966 content::NotificationService::AllSources()).Wait(); 967 content::NotificationService::AllSources()).Wait();
967 968
968 // Wait for the wallpaper to load. 969 // Wait for the wallpaper to load.
969 WaitForWallpaper(); 970 WaitForWallpaper();
970 EXPECT_TRUE(wallpaper_loaded()); 971 EXPECT_TRUE(wallpaper_loaded());
971 } 972 }
972 973
973 } // namespace chromeos 974 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698