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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 (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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 public: 165 public:
166 FileManagerPrivateApiTest() 166 FileManagerPrivateApiTest()
167 : disk_mount_manager_mock_(NULL) { 167 : disk_mount_manager_mock_(NULL) {
168 InitMountPoints(); 168 InitMountPoints();
169 } 169 }
170 170
171 ~FileManagerPrivateApiTest() override { 171 ~FileManagerPrivateApiTest() override {
172 DCHECK(!disk_mount_manager_mock_); 172 DCHECK(!disk_mount_manager_mock_);
173 DCHECK(!testing_profile_); 173 DCHECK(!testing_profile_);
174 DCHECK(!event_router_); 174 DCHECK(!event_router_);
175 STLDeleteValues(&volumes_); 175 base::STLDeleteValues(&volumes_);
176 } 176 }
177 177
178 void SetUpOnMainThread() override { 178 void SetUpOnMainThread() override {
179 ExtensionApiTest::SetUpOnMainThread(); 179 ExtensionApiTest::SetUpOnMainThread();
180 180
181 testing_profile_.reset(new TestingProfile()); 181 testing_profile_.reset(new TestingProfile());
182 event_router_.reset(new file_manager::EventRouter(testing_profile_.get())); 182 event_router_.reset(new file_manager::EventRouter(testing_profile_.get()));
183 } 183 }
184 184
185 void TearDownOnMainThread() override { 185 void TearDownOnMainThread() override {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 ->RegisterFileSystem( 441 ->RegisterFileSystem(
442 kLocalMountPointName, storage::kFileSystemTypeNativeLocal, 442 kLocalMountPointName, storage::kFileSystemTypeNativeLocal,
443 storage::FileSystemMountOption(), mount_point_dir)); 443 storage::FileSystemMountOption(), mount_point_dir));
444 file_manager::VolumeManager::Get(browser()->profile()) 444 file_manager::VolumeManager::Get(browser()->profile())
445 ->AddVolumeForTesting(mount_point_dir, file_manager::VOLUME_TYPE_TESTING, 445 ->AddVolumeForTesting(mount_point_dir, file_manager::VOLUME_TYPE_TESTING,
446 chromeos::DEVICE_TYPE_UNKNOWN, 446 chromeos::DEVICE_TYPE_UNKNOWN,
447 false /* read_only */); 447 false /* read_only */);
448 448
449 ASSERT_TRUE(RunComponentExtensionTest("file_browser/content_checksum_test")); 449 ASSERT_TRUE(RunComponentExtensionTest("file_browser/content_checksum_test"));
450 } 450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698