chrome/browser/chromeos/login/network_screen_browsertest.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 8 years, 8 months 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

OLD	NEW
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 <string>	5 #include <string>

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

9 #include "base/string16.h"	9 #include "base/string16.h"

10 #include "base/string_number_conversions.h"	10 #include "base/string_number_conversions.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "chrome/browser/chromeos/cros/cros_library.h"	12 #include "chrome/browser/chromeos/cros/cros_library.h"

13 #include "chrome/browser/chromeos/cros/mock_network_library.h"	13 #include "chrome/browser/chromeos/cros/mock_network_library.h"

14 #include "chrome/browser/chromeos/cros/network_library.h"	14 #include "chrome/browser/chromeos/cros/network_library.h"

15 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

16 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"

17 #include "chrome/browser/chromeos/login/mock_screen_observer.h"	15 #include "chrome/browser/chromeos/login/mock_screen_observer.h"

18 #include "chrome/browser/chromeos/login/network_screen.h"	16 #include "chrome/browser/chromeos/login/network_screen.h"

19 #include "chrome/browser/chromeos/login/view_screen.h"	17 #include "chrome/browser/chromeos/login/view_screen.h"

20 #include "chrome/browser/chromeos/login/wizard_controller.h"	18 #include "chrome/browser/chromeos/login/wizard_controller.h"

21 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"	19 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"

22 #include "chrome/browser/chromeos/login/wizard_screen.h"	20 #include "chrome/browser/chromeos/login/wizard_screen.h"

23 #include "chrome/test/base/ui_test_utils.h"	21 #include "chrome/test/base/ui_test_utils.h"

	22 #include "chromeos/dbus/mock_dbus_thread_manager.h"

	23 #include "chromeos/dbus/mock_session_manager_client.h"

24 #include "grit/generated_resources.h"	24 #include "grit/generated_resources.h"

25 #include "testing/gmock/include/gmock/gmock.h"	25 #include "testing/gmock/include/gmock/gmock.h"

26 #include "testing/gtest/include/gtest/gtest.h"	26 #include "testing/gtest/include/gtest/gtest.h"

27 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

28 #include "ui/views/controls/button/text_button.h"	28 #include "ui/views/controls/button/text_button.h"

29	29

30 namespace chromeos {	30 namespace chromeos {

31 using ::testing::A;	31 using ::testing::A;

32 using ::testing::AnyNumber;	32 using ::testing::AnyNumber;

33 using ::testing::InvokeWithoutArgs;	33 using ::testing::InvokeWithoutArgs;

(...skipping 237 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
271 // EXPECT_FALSE(actor_->IsConnecting());	271 // EXPECT_FALSE(actor_->IsConnecting());

272 network_screen_->OnConnectionTimeout();	272 network_screen_->OnConnectionTimeout();

273	273

274 // Close infobubble with error message - it makes the test stable.	274 // Close infobubble with error message - it makes the test stable.

275 // EXPECT_FALSE(actor_->IsContinueEnabled());	275 // EXPECT_FALSE(actor_->IsContinueEnabled());

276 // EXPECT_FALSE(actor_->IsConnecting());	276 // EXPECT_FALSE(actor_->IsConnecting());

277 // actor_->ClearErrors();	277 // actor_->ClearErrors();

278 }	278 }

279	279

280 } // namespace chromeos	280 } // namespace chromeos

OLD	NEW