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

Side by Side Diff: chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. Created 6 years, 5 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
OLDNEW
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 "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h" 5 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/common/extensions/api/image_writer_private.h" 7 #include "chrome/common/extensions/api/image_writer_private.h"
8 8
9 namespace extensions { 9 namespace extensions {
10 10
(...skipping 17 matching lines...) Expand all
28 expected2->storage_unit_id = "/test/id/2"; 28 expected2->storage_unit_id = "/test/id/2";
29 29
30 linked_ptr<RemovableStorageDevice> device1(expected1); 30 linked_ptr<RemovableStorageDevice> device1(expected1);
31 device_list->data.push_back(device1); 31 device_list->data.push_back(device1);
32 linked_ptr<RemovableStorageDevice> device2(expected2); 32 linked_ptr<RemovableStorageDevice> device2(expected2);
33 device_list->data.push_back(device2); 33 device_list->data.push_back(device2);
34 34
35 RemovableStorageProvider::SetDeviceListForTesting(device_list); 35 RemovableStorageProvider::SetDeviceListForTesting(device_list);
36 } 36 }
37 37
38 virtual void CleanUpOnMainThread() OVERRIDE { 38 virtual void TearDownOnMainThread() OVERRIDE {
39 RemovableStorageProvider::ClearDeviceListForTesting(); 39 RemovableStorageProvider::ClearDeviceListForTesting();
40 } 40 }
41 }; 41 };
42 42
43 IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) { 43 IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) {
44 ASSERT_TRUE(RunExtensionTest("image_writer_private/list_devices")) 44 ASSERT_TRUE(RunExtensionTest("image_writer_private/list_devices"))
45 << message_; 45 << message_;
46 } 46 }
47 47
48 } // namespace extensions 48 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698