OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/utility_process_host.h" | 5 #include "chrome/browser/utility_process_host.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 message_loop_->Quit(); | 117 message_loop_->Quit(); |
118 } | 118 } |
119 } | 119 } |
120 | 120 |
121 MessageLoop* message_loop_; | 121 MessageLoop* message_loop_; |
122 NotificationRegistrar registrar_; | 122 NotificationRegistrar registrar_; |
123 int child_id_; | 123 int child_id_; |
124 bool observed_; | 124 bool observed_; |
125 }; | 125 }; |
126 | 126 |
127 #if !defined(OS_POSIX) | 127 #if !defined(OS_LINUX) |
128 // We should not run this on linux (crbug.com/22703) or MacOS (crbug.com/8102) | 128 // We should not run this on linux (crbug.com/22703). |
129 // until problems related to autoupdate are fixed. | |
130 TEST_F(UtilityProcessHostTest, ExtensionUnpacker) { | 129 TEST_F(UtilityProcessHostTest, ExtensionUnpacker) { |
131 // Copy the test extension into a temp dir and install from the temp dir. | 130 // Copy the test extension into a temp dir and install from the temp dir. |
132 FilePath extension_file; | 131 FilePath extension_file; |
133 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_file)); | 132 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_file)); |
134 extension_file = extension_file.AppendASCII("extensions") | 133 extension_file = extension_file.AppendASCII("extensions") |
135 .AppendASCII("theme.crx"); | 134 .AppendASCII("theme.crx"); |
136 FilePath temp_extension_dir; | 135 FilePath temp_extension_dir; |
137 ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &temp_extension_dir)); | 136 ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &temp_extension_dir)); |
138 temp_extension_dir = temp_extension_dir.AppendASCII("extension_test"); | 137 temp_extension_dir = temp_extension_dir.AppendASCII("extension_test"); |
139 ASSERT_TRUE(file_util::CreateDirectory(temp_extension_dir)); | 138 ASSERT_TRUE(file_util::CreateDirectory(temp_extension_dir)); |
(...skipping 11 matching lines...) Expand all Loading... |
151 temp_extension_dir.AppendASCII("theme.crx")); | 150 temp_extension_dir.AppendASCII("theme.crx")); |
152 observer.RunUntilClose(process_host->id()); | 151 observer.RunUntilClose(process_host->id()); |
153 EXPECT_TRUE(client->success()); | 152 EXPECT_TRUE(client->success()); |
154 | 153 |
155 // Clean up the temp dir. | 154 // Clean up the temp dir. |
156 file_util::Delete(temp_extension_dir, true); | 155 file_util::Delete(temp_extension_dir, true); |
157 } | 156 } |
158 #endif | 157 #endif |
159 | 158 |
160 } // namespace | 159 } // namespace |
OLD | NEW |