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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert Created 6 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
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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chrome/browser/policy/test/local_policy_test_server.h" 67 #include "chrome/browser/policy/test/local_policy_test_server.h"
68 #include "chrome/browser/prefs/session_startup_pref.h" 68 #include "chrome/browser/prefs/session_startup_pref.h"
69 #include "chrome/browser/profiles/profile.h" 69 #include "chrome/browser/profiles/profile.h"
70 #include "chrome/browser/profiles/profile_manager.h" 70 #include "chrome/browser/profiles/profile_manager.h"
71 #include "chrome/browser/ui/browser.h" 71 #include "chrome/browser/ui/browser.h"
72 #include "chrome/browser/ui/browser_commands.h" 72 #include "chrome/browser/ui/browser_commands.h"
73 #include "chrome/browser/ui/browser_finder.h" 73 #include "chrome/browser/ui/browser_finder.h"
74 #include "chrome/browser/ui/browser_list.h" 74 #include "chrome/browser/ui/browser_list.h"
75 #include "chrome/browser/ui/browser_list_observer.h" 75 #include "chrome/browser/ui/browser_list_observer.h"
76 #include "chrome/browser/ui/browser_window.h" 76 #include "chrome/browser/ui/browser_window.h"
77 #include "chrome/browser/ui/extensions/app_launch_params.h"
78 #include "chrome/browser/ui/extensions/application_launch.h" 77 #include "chrome/browser/ui/extensions/application_launch.h"
79 #include "chrome/browser/ui/host_desktop.h" 78 #include "chrome/browser/ui/host_desktop.h"
80 #include "chrome/browser/ui/tabs/tab_strip_model.h" 79 #include "chrome/browser/ui/tabs/tab_strip_model.h"
81 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 80 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
82 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 81 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
83 #include "chrome/common/chrome_paths.h" 82 #include "chrome/common/chrome_paths.h"
84 #include "chrome/common/extensions/extension_constants.h" 83 #include "chrome/common/extensions/extension_constants.h"
85 #include "chrome/grit/chromium_strings.h" 84 #include "chrome/grit/chromium_strings.h"
86 #include "chrome/grit/generated_resources.h" 85 #include "chrome/grit/generated_resources.h"
87 #include "chromeos/chromeos_paths.h" 86 #include "chromeos/chromeos_paths.h"
(...skipping 25 matching lines...) Expand all
113 #include "content/public/browser/web_ui.h" 112 #include "content/public/browser/web_ui.h"
114 #include "content/public/test/browser_test_utils.h" 113 #include "content/public/test/browser_test_utils.h"
115 #include "content/public/test/test_utils.h" 114 #include "content/public/test/test_utils.h"
116 #include "crypto/rsa_private_key.h" 115 #include "crypto/rsa_private_key.h"
117 #include "extensions/browser/app_window/app_window.h" 116 #include "extensions/browser/app_window/app_window.h"
118 #include "extensions/browser/app_window/app_window_registry.h" 117 #include "extensions/browser/app_window/app_window_registry.h"
119 #include "extensions/browser/app_window/native_app_window.h" 118 #include "extensions/browser/app_window/native_app_window.h"
120 #include "extensions/browser/extension_system.h" 119 #include "extensions/browser/extension_system.h"
121 #include "extensions/browser/management_policy.h" 120 #include "extensions/browser/management_policy.h"
122 #include "extensions/browser/notification_types.h" 121 #include "extensions/browser/notification_types.h"
123 #include "extensions/common/constants.h"
124 #include "extensions/common/extension.h" 122 #include "extensions/common/extension.h"
125 #include "net/base/url_util.h" 123 #include "net/base/url_util.h"
126 #include "net/http/http_status_code.h" 124 #include "net/http/http_status_code.h"
127 #include "net/test/embedded_test_server/embedded_test_server.h" 125 #include "net/test/embedded_test_server/embedded_test_server.h"
128 #include "net/test/embedded_test_server/http_request.h" 126 #include "net/test/embedded_test_server/http_request.h"
129 #include "net/test/embedded_test_server/http_response.h" 127 #include "net/test/embedded_test_server/http_response.h"
130 #include "net/url_request/test_url_fetcher_factory.h" 128 #include "net/url_request/test_url_fetcher_factory.h"
131 #include "net/url_request/url_fetcher_delegate.h" 129 #include "net/url_request/url_fetcher_delegate.h"
132 #include "net/url_request/url_request_status.h" 130 #include "net/url_request/url_request_status.h"
133 #include "policy/policy_constants.h" 131 #include "policy/policy_constants.h"
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 base::FilePath test_dir; 1318 base::FilePath test_dir;
1321 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir)); 1319 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
1322 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath)); 1320 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath));
1323 app_install_observer.Wait(); 1321 app_install_observer.Wait();
1324 const extensions::Extension* app = 1322 const extensions::Extension* app =
1325 content::Details<const extensions::Extension>( 1323 content::Details<const extensions::Extension>(
1326 app_install_observer.details()).ptr(); 1324 app_install_observer.details()).ptr();
1327 1325
1328 // Start the platform app, causing it to open a window. 1326 // Start the platform app, causing it to open a window.
1329 run_loop_.reset(new base::RunLoop); 1327 run_loop_.reset(new base::RunLoop);
1330 OpenApplication(AppLaunchParams(profile, app, 1328 OpenApplication(AppLaunchParams(
1331 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 1329 profile, app, extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW));
1332 extensions::SOURCE_UNTRACKED));
1333 run_loop_->Run(); 1330 run_loop_->Run();
1334 EXPECT_EQ(1U, app_window_registry->app_windows().size()); 1331 EXPECT_EQ(1U, app_window_registry->app_windows().size());
1335 1332
1336 // Close the only open browser window. 1333 // Close the only open browser window.
1337 BrowserList* browser_list = 1334 BrowserList* browser_list =
1338 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); 1335 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
1339 EXPECT_EQ(1U, browser_list->size()); 1336 EXPECT_EQ(1U, browser_list->size());
1340 Browser* browser = browser_list->get(0); 1337 Browser* browser = browser_list->get(0);
1341 ASSERT_TRUE(browser); 1338 ASSERT_TRUE(browser);
1342 BrowserWindow* browser_window = browser->window(); 1339 BrowserWindow* browser_window = browser->window();
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
2088 ASSERT_TRUE(content::ExecuteScript(contents_, 2085 ASSERT_TRUE(content::ExecuteScript(contents_,
2089 "$('tos-accept-button').click();")); 2086 "$('tos-accept-button').click();"));
2090 2087
2091 WaitForSessionStart(); 2088 WaitForSessionStart();
2092 } 2089 }
2093 2090
2094 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2091 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2095 TermsOfServiceDownloadTest, testing::Bool()); 2092 TermsOfServiceDownloadTest, testing::Bool());
2096 2093
2097 } // namespace policy 2094 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698