chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

Side by Side Diff: chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/api/image_writer_private/test_utils.cc ('k') | chrome/browser/extensions/api/system_private/system_private_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/files/file_path.h"	7 #include "base/files/file_path.h"

8 #include "base/files/file_util.h"	8 #include "base/files/file_util.h"

9 #include "chrome/browser/extensions/extension_apitest.h"	9 #include "chrome/browser/extensions/extension_apitest.h"

10 #include "chrome/common/chrome_switches.h"	10 #include "chrome/common/chrome_switches.h"

11 #include "chromeos/dbus/fake_dbus_thread_manager.h"	11 #include "chromeos/dbus/dbus_thread_manager.h"

12 #include "chromeos/dbus/fake_debug_daemon_client.h"	12 #include "chromeos/dbus/fake_debug_daemon_client.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14 #include "extensions/common/extension_builder.h"	14 #include "extensions/common/extension_builder.h"

15 #include "net/dns/mock_host_resolver.h"	15 #include "net/dns/mock_host_resolver.h"

16 #include "net/test/embedded_test_server/embedded_test_server.h"	16 #include "net/test/embedded_test_server/embedded_test_server.h"

17 #include "net/test/embedded_test_server/http_request.h"	17 #include "net/test/embedded_test_server/http_request.h"

18 #include "net/test/embedded_test_server/http_response.h"	18 #include "net/test/embedded_test_server/http_response.h"

19	19

20 using net::test_server::BasicHttpResponse;	20 using net::test_server::BasicHttpResponse;

21 using net::test_server::HttpResponse;	21 using net::test_server::HttpResponse;

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 namespace extensions {	62 namespace extensions {

63	63

64 class LogPrivateApiTest : public ExtensionApiTest {	64 class LogPrivateApiTest : public ExtensionApiTest {

65 public:	65 public:

66 LogPrivateApiTest() {}	66 LogPrivateApiTest() {}

67	67

68 virtual ~LogPrivateApiTest() {}	68 virtual ~LogPrivateApiTest() {}

69	69

70 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {	70 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

71 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =

72 new chromeos::FakeDBusThreadManager;

73 fake_dbus_thread_manager->SetFakeClients();

74 base::FilePath tar_file_path =	71 base::FilePath tar_file_path =

75 test_data_dir_.Append("log_private/dump_logs/system_logs.tar");	72 test_data_dir_.Append("log_private/dump_logs/system_logs.tar");

76 fake_dbus_thread_manager->SetDebugDaemonClient(	73 chromeos::DBusThreadManager::GetSetterForTesting()->SetDebugDaemonClient(

77 scoped_ptr<chromeos::DebugDaemonClient>(	74 scoped_ptr<chromeos::DebugDaemonClient>(

78 new TestDebugDaemonClient(tar_file_path)));	75 new TestDebugDaemonClient(tar_file_path)));

79 chromeos::DBusThreadManager::SetInstanceForTesting(

80 fake_dbus_thread_manager);

81 ExtensionApiTest::SetUpInProcessBrowserTestFixture();	76 ExtensionApiTest::SetUpInProcessBrowserTestFixture();

82 }	77 }

83	78

84 scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {	79 scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {

85 scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse);	80 scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse);

86 response->set_code(net::HTTP_OK);	81 response->set_code(net::HTTP_OK);

87 response->set_content(	82 response->set_content(

88 "<html><head><title>LogPrivateTest</title>"	83 "<html><head><title>LogPrivateTest</title>"

89 "</head><body>Hello!</body></html>");	84 "</head><body>Hello!</body></html>");

90 return response.PassAs<HttpResponse>();	85 return response.PassAs<HttpResponse>();

91 }	86 }

92 };	87 };

93	88

94 IN_PROC_BROWSER_TEST_F(LogPrivateApiTest, DumpLogsAndCaptureEvents) {	89 IN_PROC_BROWSER_TEST_F(LogPrivateApiTest, DumpLogsAndCaptureEvents) {

95 // Setup dummy HTTP server.	90 // Setup dummy HTTP server.

96 host_resolver()->AddRule("www.test.com", "127.0.0.1");	91 host_resolver()->AddRule("www.test.com", "127.0.0.1");

97 ASSERT_TRUE(StartEmbeddedTestServer());	92 ASSERT_TRUE(StartEmbeddedTestServer());

98 embedded_test_server()->RegisterRequestHandler(	93 embedded_test_server()->RegisterRequestHandler(

99 base::Bind(&LogPrivateApiTest::HandleRequest, base::Unretained(this)));	94 base::Bind(&LogPrivateApiTest::HandleRequest, base::Unretained(this)));

100	95

101 ASSERT_TRUE(RunExtensionTest("log_private/dump_logs"));	96 ASSERT_TRUE(RunExtensionTest("log_private/dump_logs"));

102 }	97 }

103	98

104 } // namespace extensions	99 } // namespace extensions

OLD	NEW