| 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 "base/strings/stringprintf.h" | 5 #include "base/strings/stringprintf.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_
private_api.h" | 7 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_
private_api.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_); | 99 StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_); |
| 100 content::RunAllPendingInMessageLoop(); | 100 content::RunAllPendingInMessageLoop(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 private: | 103 private: |
| 104 std::string device_id_; | 104 std::string device_id_; |
| 105 | 105 |
| 106 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest); | 106 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest); |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, DeviceAttachDetachEvents) { | 109 // Fails on official Linux bot. See http://crbug.com/315276 |
| 110 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX) |
| 111 #define MAYBE_DeviceAttachDetachEvents DISABLED_DeviceAttachDetachEvents |
| 112 #else |
| 113 #define MAYBE_DeviceAttachDetachEvents DeviceAttachDetachEvents |
| 114 #endif |
| 115 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, |
| 116 MAYBE_DeviceAttachDetachEvents) { |
| 110 // Setup. | 117 // Setup. |
| 111 TestStorageMonitor::SyncInitialize(); | 118 TestStorageMonitor::SyncInitialize(); |
| 112 const extensions::Extension* extension = | 119 const extensions::Extension* extension = |
| 113 LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath)); | 120 LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath)); |
| 114 ASSERT_TRUE(extension); | 121 ASSERT_TRUE(extension); |
| 115 | 122 |
| 116 content::RenderViewHost* host = | 123 content::RenderViewHost* host = |
| 117 extensions::ExtensionSystem::Get(browser()->profile())-> | 124 extensions::ExtensionSystem::Get(browser()->profile())-> |
| 118 process_manager()->GetBackgroundHostForExtension(extension->id())-> | 125 process_manager()->GetBackgroundHostForExtension(extension->id())-> |
| 119 render_view_host(); | 126 render_view_host(); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 Attach(); | 182 Attach(); |
| 176 EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied()); | 183 EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied()); |
| 177 Detach(); | 184 Detach(); |
| 178 EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied()); | 185 EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied()); |
| 179 | 186 |
| 180 Attach(); | 187 Attach(); |
| 181 EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied()); | 188 EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied()); |
| 182 Detach(); | 189 Detach(); |
| 183 EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied()); | 190 EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied()); |
| 184 } | 191 } |
| OLD | NEW |