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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_watcher_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/file_manager/file_watcher.h" 5 #include "chrome/browser/chromeos/file_manager/file_watcher.h"
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "content/public/test/test_browser_thread_bundle.h" 11 #include "content/public/test/test_browser_thread_bundle.h"
12 #include "google_apis/drive/test_util.h" 12 #include "google_apis/drive/test_util.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace file_manager { 15 namespace file_manager {
16 namespace { 16 namespace {
17 17
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // This is ugly, but FileWatcher should be deleted explicitly here, and 147 // This is ugly, but FileWatcher should be deleted explicitly here, and
148 // spin the message loop so the base::FilePathWatcher is deleted. 148 // spin the message loop so the base::FilePathWatcher is deleted.
149 // Otherwise, base::FilePathWatcher may detect a change when the temporary 149 // Otherwise, base::FilePathWatcher may detect a change when the temporary
150 // directory is deleted, which may result in crash. 150 // directory is deleted, which may result in crash.
151 file_watcher.reset(); 151 file_watcher.reset();
152 base::RunLoop().RunUntilIdle(); 152 base::RunLoop().RunUntilIdle();
153 } 153 }
154 154
155 } // namespace 155 } // namespace
156 } // namespace file_manager. 156 } // namespace file_manager.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698