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

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

Issue 83633004: Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style fix Created 7 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 | 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chrome/browser/ui/browser_list.h" 67 #include "chrome/browser/ui/browser_list.h"
68 #include "chrome/browser/ui/browser_window.h" 68 #include "chrome/browser/ui/browser_window.h"
69 #include "chrome/browser/ui/host_desktop.h" 69 #include "chrome/browser/ui/host_desktop.h"
70 #include "chrome/browser/ui/tabs/tab_strip_model.h" 70 #include "chrome/browser/ui/tabs/tab_strip_model.h"
71 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 71 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
72 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 72 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
73 #include "chrome/common/chrome_paths.h" 73 #include "chrome/common/chrome_paths.h"
74 #include "chrome/common/chrome_switches.h" 74 #include "chrome/common/chrome_switches.h"
75 #include "chromeos/chromeos_paths.h" 75 #include "chromeos/chromeos_paths.h"
76 #include "chromeos/chromeos_switches.h" 76 #include "chromeos/chromeos_switches.h"
77 #include "chromeos/dbus/cryptohome_client.h"
78 #include "chromeos/dbus/dbus_method_call_status.h"
79 #include "chromeos/dbus/fake_session_manager_client.h" 77 #include "chromeos/dbus/fake_session_manager_client.h"
80 #include "chromeos/dbus/session_manager_client.h"
81 #include "components/policy/core/common/external_data_fetcher.h" 78 #include "components/policy/core/common/external_data_fetcher.h"
82 #include "components/policy/core/common/policy_map.h" 79 #include "components/policy/core/common/policy_map.h"
83 #include "components/policy/core/common/policy_namespace.h" 80 #include "components/policy/core/common/policy_namespace.h"
84 #include "content/public/browser/notification_details.h" 81 #include "content/public/browser/notification_details.h"
85 #include "content/public/browser/notification_source.h" 82 #include "content/public/browser/notification_source.h"
86 #include "content/public/browser/web_contents.h" 83 #include "content/public/browser/web_contents.h"
87 #include "content/public/browser/web_ui.h" 84 #include "content/public/browser/web_ui.h"
88 #include "content/public/test/browser_test_utils.h" 85 #include "content/public/test/browser_test_utils.h"
89 #include "content/public/test/test_utils.h" 86 #include "content/public/test/test_utils.h"
90 #include "crypto/rsa_private_key.h" 87 #include "crypto/rsa_private_key.h"
91 #include "extensions/common/extension.h" 88 #include "extensions/common/extension.h"
92 #include "grit/chromium_strings.h" 89 #include "grit/chromium_strings.h"
93 #include "grit/generated_resources.h" 90 #include "grit/generated_resources.h"
94 #include "net/base/url_util.h" 91 #include "net/base/url_util.h"
95 #include "net/http/http_status_code.h" 92 #include "net/http/http_status_code.h"
96 #include "net/test/embedded_test_server/embedded_test_server.h" 93 #include "net/test/embedded_test_server/embedded_test_server.h"
97 #include "net/test/embedded_test_server/http_request.h" 94 #include "net/test/embedded_test_server/http_request.h"
98 #include "net/test/embedded_test_server/http_response.h" 95 #include "net/test/embedded_test_server/http_response.h"
99 #include "net/url_request/test_url_fetcher_factory.h" 96 #include "net/url_request/test_url_fetcher_factory.h"
100 #include "net/url_request/url_fetcher_delegate.h" 97 #include "net/url_request/url_fetcher_delegate.h"
101 #include "net/url_request/url_request_status.h" 98 #include "net/url_request/url_request_status.h"
102 #include "policy/policy_constants.h" 99 #include "policy/policy_constants.h"
103 #include "testing/gmock/include/gmock/gmock.h" 100 #include "testing/gmock/include/gmock/gmock.h"
104 #include "third_party/cros_system_api/dbus/service_constants.h" 101 //#include "third_party/cros_system_api/dbus/service_constants.h"
105 #include "ui/base/l10n/l10n_util.h" 102 #include "ui/base/l10n/l10n_util.h"
106 #include "url/gurl.h" 103 #include "url/gurl.h"
107 104
108 namespace em = enterprise_management; 105 namespace em = enterprise_management;
109 106
110 using chromeos::LoginScreenContext; 107 using chromeos::LoginScreenContext;
111 using testing::InvokeWithoutArgs; 108 using testing::InvokeWithoutArgs;
112 using testing::Return; 109 using testing::Return;
113 using testing::_; 110 using testing::_;
114 111
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 ASSERT_TRUE(test_server_.Start()); 286 ASSERT_TRUE(test_server_.Start());
290 287
291 ASSERT_TRUE(extension_cache_root_dir_.CreateUniqueTempDir()); 288 ASSERT_TRUE(extension_cache_root_dir_.CreateUniqueTempDir());
292 extension_cache_root_dir_override_.reset(new base::ScopedPathOverride( 289 extension_cache_root_dir_override_.reset(new base::ScopedPathOverride(
293 chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS, 290 chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
294 extension_cache_root_dir_.path())); 291 extension_cache_root_dir_.path()));
295 ASSERT_TRUE(external_data_cache_dir_.CreateUniqueTempDir()); 292 ASSERT_TRUE(external_data_cache_dir_.CreateUniqueTempDir());
296 external_data_cache_dir_override_.reset(new base::ScopedPathOverride( 293 external_data_cache_dir_override_.reset(new base::ScopedPathOverride(
297 chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA, 294 chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA,
298 external_data_cache_dir_.path())); 295 external_data_cache_dir_.path()));
299
300 DevicePolicyCrosBrowserTest::SetUp(); 296 DevicePolicyCrosBrowserTest::SetUp();
301 } 297 }
302 298
303 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 299 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
304 DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line); 300 DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line);
305 command_line->AppendSwitch(chromeos::switches::kLoginManager); 301 command_line->AppendSwitch(chromeos::switches::kLoginManager);
306 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 302 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
307 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 303 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
308 command_line->AppendSwitchASCII( 304 command_line->AppendSwitchASCII(
309 switches::kDeviceManagementUrl, test_server_.GetServiceURL().spec()); 305 switches::kDeviceManagementUrl, test_server_.GetServiceURL().spec());
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 if (!IsSessionStarted()) { 1078 if (!IsSessionStarted()) {
1083 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, 1079 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
1084 base::Bind(IsSessionStarted)).Wait(); 1080 base::Bind(IsSessionStarted)).Wait();
1085 } 1081 }
1086 } 1082 }
1087 1083
1088 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, 1084 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance,
1089 TermsOfServiceTest, testing::Bool()); 1085 TermsOfServiceTest, testing::Bool());
1090 1086
1091 } // namespace policy 1087 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698