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

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

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "chrome/browser/extensions/api/file_system/file_system_api.h" 6 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
7 #include "chrome/browser/extensions/api/image_writer_private/operation.h" 7 #include "chrome/browser/extensions/api/image_writer_private/operation.h"
8 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h" 8 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h"
9 #include "chrome/browser/extensions/api/image_writer_private/test_utils.h" 9 #include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/common/extensions/api/image_writer_private.h" 11 #include "chrome/common/extensions/api/image_writer_private.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 using api::image_writer_private::RemovableStorageDevice; 16 using api::image_writer_private::RemovableStorageDevice;
17 using extensions::image_writer::FakeImageWriterClient; 17 using extensions::image_writer::FakeImageWriterClient;
18 18
19 class ImageWriterPrivateApiTest : public ExtensionApiTest { 19 class ImageWriterPrivateApiTest : public ExtensionApiTest {
20 public: 20 public:
21 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 21 virtual void SetUpInProcessBrowserTestFixture() override {
22 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 22 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
23 test_utils_.SetUp(true); 23 test_utils_.SetUp(true);
24 24
25 ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetImagePath(), 25 ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetImagePath(),
26 image_writer::kImagePattern, 26 image_writer::kImagePattern,
27 image_writer::kTestFileSize)); 27 image_writer::kTestFileSize));
28 ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetDevicePath(), 28 ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetDevicePath(),
29 image_writer::kDevicePattern, 29 image_writer::kDevicePattern,
30 image_writer::kTestFileSize)); 30 image_writer::kTestFileSize));
31 31
(...skipping 22 matching lines...) Expand all
54 #endif 54 #endif
55 55
56 linked_ptr<RemovableStorageDevice> device1(expected1); 56 linked_ptr<RemovableStorageDevice> device1(expected1);
57 device_list->data.push_back(device1); 57 device_list->data.push_back(device1);
58 linked_ptr<RemovableStorageDevice> device2(expected2); 58 linked_ptr<RemovableStorageDevice> device2(expected2);
59 device_list->data.push_back(device2); 59 device_list->data.push_back(device2);
60 60
61 RemovableStorageProvider::SetDeviceListForTesting(device_list); 61 RemovableStorageProvider::SetDeviceListForTesting(device_list);
62 } 62 }
63 63
64 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 64 virtual void TearDownInProcessBrowserTestFixture() override {
65 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); 65 ExtensionApiTest::TearDownInProcessBrowserTestFixture();
66 test_utils_.TearDown(); 66 test_utils_.TearDown();
67 RemovableStorageProvider::ClearDeviceListForTesting(); 67 RemovableStorageProvider::ClearDeviceListForTesting();
68 FileSystemChooseEntryFunction::StopSkippingPickerForTest(); 68 FileSystemChooseEntryFunction::StopSkippingPickerForTest();
69 } 69 }
70 70
71 #if !defined(OS_CHROMEOS) 71 #if !defined(OS_CHROMEOS)
72 void ImageWriterUtilityClientCall() { 72 void ImageWriterUtilityClientCall() {
73 content::BrowserThread::PostTask( 73 content::BrowserThread::PostTask(
74 content::BrowserThread::FILE, 74 content::BrowserThread::FILE,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 &ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this)); 118 &ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this));
119 test_utils_.GetUtilityClient()->SetVerifyCallback(base::Bind( 119 test_utils_.GetUtilityClient()->SetVerifyCallback(base::Bind(
120 &ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this)); 120 &ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this));
121 #endif 121 #endif
122 122
123 ASSERT_TRUE(RunPlatformAppTest("image_writer_private/write_from_file")) 123 ASSERT_TRUE(RunPlatformAppTest("image_writer_private/write_from_file"))
124 << message_; 124 << message_;
125 } 125 }
126 126
127 } // namespace extensions 127 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698