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

Side by Side Diff: chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback 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
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 // Disable everything on windows only. http://crbug.com/306144 5 // Disable everything on windows only. http://crbug.com/306144
6 #ifndef OS_WIN 6 #ifndef OS_WIN
7 7
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "content/test/net/url_request_slow_download_job.h" 44 #include "content/test/net/url_request_slow_download_job.h"
45 #include "extensions/browser/event_router.h" 45 #include "extensions/browser/event_router.h"
46 #include "extensions/browser/notification_types.h" 46 #include "extensions/browser/notification_types.h"
47 #include "net/base/data_url.h" 47 #include "net/base/data_url.h"
48 #include "net/base/net_util.h" 48 #include "net/base/net_util.h"
49 #include "net/url_request/url_request.h" 49 #include "net/url_request/url_request.h"
50 #include "net/url_request/url_request_context.h" 50 #include "net/url_request/url_request_context.h"
51 #include "net/url_request/url_request_job.h" 51 #include "net/url_request/url_request_job.h"
52 #include "net/url_request/url_request_job_factory.h" 52 #include "net/url_request/url_request_job_factory.h"
53 #include "net/url_request/url_request_job_factory_impl.h" 53 #include "net/url_request/url_request_job_factory_impl.h"
54 #include "webkit/browser/fileapi/file_system_context.h" 54 #include "storage/browser/fileapi/file_system_context.h"
55 #include "webkit/browser/fileapi/file_system_operation_runner.h" 55 #include "storage/browser/fileapi/file_system_operation_runner.h"
56 #include "webkit/browser/fileapi/file_system_url.h" 56 #include "storage/browser/fileapi/file_system_url.h"
57 57
58 using content::BrowserContext; 58 using content::BrowserContext;
59 using content::BrowserThread; 59 using content::BrowserThread;
60 using content::DownloadItem; 60 using content::DownloadItem;
61 using content::DownloadManager; 61 using content::DownloadManager;
62 using content::URLRequestSlowDownloadJob; 62 using content::URLRequestSlowDownloadJob;
63 63
64 namespace errors = download_extension_errors; 64 namespace errors = download_extension_errors;
65 65
66 namespace extensions { 66 namespace extensions {
(...skipping 4088 matching lines...) Expand 10 before | Expand all | Expand 10 after
4155 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action); 4155 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
4156 EXPECT_FALSE(warnings.empty()); 4156 EXPECT_FALSE(warnings.empty());
4157 EXPECT_EQ(Warning::kDownloadFilenameConflict, 4157 EXPECT_EQ(Warning::kDownloadFilenameConflict,
4158 warnings.begin()->warning_type()); 4158 warnings.begin()->warning_type());
4159 EXPECT_EQ("incumbent", warnings.begin()->extension_id()); 4159 EXPECT_EQ("incumbent", warnings.begin()->extension_id());
4160 } 4160 }
4161 4161
4162 } // namespace extensions 4162 } // namespace extensions
4163 4163
4164 #endif // http://crbug.com/3061144 4164 #endif // http://crbug.com/3061144
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698