| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/json/json_file_value_serializer.h" | 8 #include "base/json/json_file_value_serializer.h" |
| 9 #include "base/location.h" |
| 9 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/chromeos/login/login_manager_test.h" | 14 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 12 #include "chrome/browser/chromeos/login/startup_utils.h" | 15 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 13 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" | 16 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" |
| 14 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 17 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 18 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
| 16 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 19 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
| 17 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" |
| 18 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
| 19 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 FakeDebugDaemonClient::QueryDebuggingFeatures( | 75 FakeDebugDaemonClient::QueryDebuggingFeatures( |
| 73 base::Bind(&TestDebugDaemonClient::OnQueryDebuggingFeatures, | 76 base::Bind(&TestDebugDaemonClient::OnQueryDebuggingFeatures, |
| 74 base::Unretained(this), | 77 base::Unretained(this), |
| 75 callback)); | 78 callback)); |
| 76 } | 79 } |
| 77 | 80 |
| 78 void OnRemoveRootfsVerification( | 81 void OnRemoveRootfsVerification( |
| 79 const DebugDaemonClient::EnableDebuggingCallback& original_callback, | 82 const DebugDaemonClient::EnableDebuggingCallback& original_callback, |
| 80 bool succeeded) { | 83 bool succeeded) { |
| 81 LOG(WARNING) << "OnRemoveRootfsVerification: succeeded = " << succeeded; | 84 LOG(WARNING) << "OnRemoveRootfsVerification: succeeded = " << succeeded; |
| 82 base::MessageLoop::current()->PostTask( | 85 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 83 FROM_HERE, | 86 FROM_HERE, base::Bind(original_callback, succeeded)); |
| 84 base::Bind(original_callback, succeeded)); | |
| 85 if (runner_.get()) | 87 if (runner_.get()) |
| 86 runner_->Quit(); | 88 runner_->Quit(); |
| 87 else | 89 else |
| 88 got_reply_ = true; | 90 got_reply_ = true; |
| 89 | 91 |
| 90 num_remove_protection_++; | 92 num_remove_protection_++; |
| 91 } | 93 } |
| 92 | 94 |
| 93 void OnQueryDebuggingFeatures( | 95 void OnQueryDebuggingFeatures( |
| 94 const DebugDaemonClient::QueryDevFeaturesCallback& original_callback, | 96 const DebugDaemonClient::QueryDevFeaturesCallback& original_callback, |
| 95 bool succeeded, | 97 bool succeeded, |
| 96 int feature_mask) { | 98 int feature_mask) { |
| 97 LOG(WARNING) << "OnQueryDebuggingFeatures: succeeded = " << succeeded | 99 LOG(WARNING) << "OnQueryDebuggingFeatures: succeeded = " << succeeded |
| 98 << ", feature_mask = " << feature_mask; | 100 << ", feature_mask = " << feature_mask; |
| 99 base::MessageLoop::current()->PostTask( | 101 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 100 FROM_HERE, | 102 FROM_HERE, base::Bind(original_callback, succeeded, feature_mask)); |
| 101 base::Bind(original_callback, succeeded, feature_mask)); | |
| 102 if (runner_.get()) | 103 if (runner_.get()) |
| 103 runner_->Quit(); | 104 runner_->Quit(); |
| 104 else | 105 else |
| 105 got_reply_ = true; | 106 got_reply_ = true; |
| 106 | 107 |
| 107 num_query_debugging_features_++; | 108 num_query_debugging_features_++; |
| 108 } | 109 } |
| 109 | 110 |
| 110 void OnEnableDebuggingFeatures( | 111 void OnEnableDebuggingFeatures( |
| 111 const DebugDaemonClient::EnableDebuggingCallback& original_callback, | 112 const DebugDaemonClient::EnableDebuggingCallback& original_callback, |
| 112 bool succeeded) { | 113 bool succeeded) { |
| 113 LOG(WARNING) << "OnEnableDebuggingFeatures: succeeded = " << succeeded | 114 LOG(WARNING) << "OnEnableDebuggingFeatures: succeeded = " << succeeded |
| 114 << ", feature_mask = "; | 115 << ", feature_mask = "; |
| 115 base::MessageLoop::current()->PostTask( | 116 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 116 FROM_HERE, | 117 FROM_HERE, base::Bind(original_callback, succeeded)); |
| 117 base::Bind(original_callback, succeeded)); | |
| 118 if (runner_.get()) | 118 if (runner_.get()) |
| 119 runner_->Quit(); | 119 runner_->Quit(); |
| 120 else | 120 else |
| 121 got_reply_ = true; | 121 got_reply_ = true; |
| 122 | 122 |
| 123 num_enable_debugging_features_++; | 123 num_enable_debugging_features_++; |
| 124 } | 124 } |
| 125 | 125 |
| 126 void ResetWait() { | 126 void ResetWait() { |
| 127 got_reply_ = false; | 127 got_reply_ = false; |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 } | 408 } |
| 409 | 409 |
| 410 // Canceling auto shown setup screen should close it. | 410 // Canceling auto shown setup screen should close it. |
| 411 IN_PROC_BROWSER_TEST_F(EnableDebuggingRequestedTest, CancelAutoShowSetup) { | 411 IN_PROC_BROWSER_TEST_F(EnableDebuggingRequestedTest, CancelAutoShowSetup) { |
| 412 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING).Wait(); | 412 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING).Wait(); |
| 413 CloseEnableDebuggingScreen(); | 413 CloseEnableDebuggingScreen(); |
| 414 JSExpect("!!document.querySelector('#debugging.hidden')"); | 414 JSExpect("!!document.querySelector('#debugging.hidden')"); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace chromeos | 417 } // namespace chromeos |
| OLD | NEW |