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

Side by Side Diff: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cros Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "chrome/browser/chromeos/login/helper.h" 6 #include "chrome/browser/chromeos/login/helper.h"
7 #include "chrome/browser/chromeos/login/screens/base_screen.h" 7 #include "chrome/browser/chromeos/login/screens/base_screen.h"
8 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" 8 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
9 #include "chrome/browser/chromeos/login/screens/network_screen.h" 9 #include "chrome/browser/chromeos/login/screens/network_screen.h"
10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
11 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
12 #include "chrome/test/base/ui_test_utils.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/dbus/fake_session_manager_client.h" 13 #include "chromeos/dbus/fake_session_manager_client.h"
15 #include "content/public/test/test_utils.h" 14 #include "content/public/test/test_utils.h"
16 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/cros_system_api/dbus/service_constants.h" 17 #include "third_party/cros_system_api/dbus/service_constants.h"
19 #include "ui/views/controls/button/button.h" 18 #include "ui/views/controls/button/button.h"
20 19
21 using ::testing::_; 20 using ::testing::_;
22 using ::testing::AnyNumber; 21 using ::testing::AnyNumber;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // EXPECT_FALSE(actor_->IsConnecting()); 140 // EXPECT_FALSE(actor_->IsConnecting());
142 network_screen_->OnConnectionTimeout(); 141 network_screen_->OnConnectionTimeout();
143 142
144 // Close infobubble with error message - it makes the test stable. 143 // Close infobubble with error message - it makes the test stable.
145 // EXPECT_FALSE(actor_->IsContinueEnabled()); 144 // EXPECT_FALSE(actor_->IsContinueEnabled());
146 // EXPECT_FALSE(actor_->IsConnecting()); 145 // EXPECT_FALSE(actor_->IsConnecting());
147 // actor_->ClearErrors(); 146 // actor_->ClearErrors();
148 } 147 }
149 148
150 } // namespace chromeos 149 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698