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

Side by Side Diff: chrome/browser/download/download_browsertest.cc

Issue 2733343002: Move chrome/common/safe_browsing/csd.proto to components/safe_browsing (Closed)
Patch Set: rebase again Created 3 years, 9 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
« no previous file with comments | « chrome/browser/download/DEPS ('k') | chrome/browser/download/download_commands.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/download/download_browsertest.h" 5 #include "chrome/browser/download/download_browsertest.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <sstream> 8 #include <sstream>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "chrome/browser/ui/browser_commands.h" 55 #include "chrome/browser/ui/browser_commands.h"
56 #include "chrome/browser/ui/browser_finder.h" 56 #include "chrome/browser/ui/browser_finder.h"
57 #include "chrome/browser/ui/browser_list.h" 57 #include "chrome/browser/ui/browser_list.h"
58 #include "chrome/browser/ui/browser_tabstrip.h" 58 #include "chrome/browser/ui/browser_tabstrip.h"
59 #include "chrome/browser/ui/browser_window.h" 59 #include "chrome/browser/ui/browser_window.h"
60 #include "chrome/browser/ui/chrome_pages.h" 60 #include "chrome/browser/ui/chrome_pages.h"
61 #include "chrome/browser/ui/tabs/tab_strip_model.h" 61 #include "chrome/browser/ui/tabs/tab_strip_model.h"
62 #include "chrome/common/chrome_paths.h" 62 #include "chrome/common/chrome_paths.h"
63 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
64 #include "chrome/common/pref_names.h" 64 #include "chrome/common/pref_names.h"
65 #include "chrome/common/safe_browsing/csd.pb.h"
66 #include "chrome/common/safe_browsing/download_file_types.pb.h" 65 #include "chrome/common/safe_browsing/download_file_types.pb.h"
67 #include "chrome/common/url_constants.h" 66 #include "chrome/common/url_constants.h"
68 #include "chrome/grit/generated_resources.h" 67 #include "chrome/grit/generated_resources.h"
69 #include "chrome/test/base/in_process_browser_test.h" 68 #include "chrome/test/base/in_process_browser_test.h"
70 #include "chrome/test/base/ui_test_utils.h" 69 #include "chrome/test/base/ui_test_utils.h"
71 #include "components/history/content/browser/download_conversions.h" 70 #include "components/history/content/browser/download_conversions.h"
72 #include "components/history/core/browser/download_constants.h" 71 #include "components/history/core/browser/download_constants.h"
73 #include "components/history/core/browser/download_row.h" 72 #include "components/history/core/browser/download_row.h"
74 #include "components/history/core/browser/history_service.h" 73 #include "components/history/core/browser/history_service.h"
75 #include "components/infobars/core/confirm_infobar_delegate.h" 74 #include "components/infobars/core/confirm_infobar_delegate.h"
76 #include "components/infobars/core/infobar.h" 75 #include "components/infobars/core/infobar.h"
77 #include "components/prefs/pref_service.h" 76 #include "components/prefs/pref_service.h"
77 #include "components/safe_browsing/csd.pb.h"
78 #include "components/safe_browsing_db/safe_browsing_prefs.h" 78 #include "components/safe_browsing_db/safe_browsing_prefs.h"
79 #include "content/public/browser/download_danger_type.h" 79 #include "content/public/browser/download_danger_type.h"
80 #include "content/public/browser/download_interrupt_reasons.h" 80 #include "content/public/browser/download_interrupt_reasons.h"
81 #include "content/public/browser/download_item.h" 81 #include "content/public/browser/download_item.h"
82 #include "content/public/browser/download_manager.h" 82 #include "content/public/browser/download_manager.h"
83 #include "content/public/browser/download_save_info.h" 83 #include "content/public/browser/download_save_info.h"
84 #include "content/public/browser/download_url_parameters.h" 84 #include "content/public/browser/download_url_parameters.h"
85 #include "content/public/browser/notification_source.h" 85 #include "content/public/browser/notification_source.h"
86 #include "content/public/browser/render_frame_host.h" 86 #include "content/public/browser/render_frame_host.h"
87 #include "content/public/browser/render_view_host.h" 87 #include "content/public/browser/render_view_host.h"
(...skipping 3710 matching lines...) Expand 10 before | Expand all | Expand 10 after
3798 browser(), 1, 3798 browser(), 1,
3799 content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY)); 3799 content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
3800 ui_test_utils::NavigateToURL(browser(), extension_url); 3800 ui_test_utils::NavigateToURL(browser(), extension_url);
3801 3801
3802 observer->WaitForFinished(); 3802 observer->WaitForFinished();
3803 3803
3804 // Download shelf should close. 3804 // Download shelf should close.
3805 EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible()); 3805 EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
3806 } 3806 }
3807 #endif // defined(OS_CHROMEOS) 3807 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/download/DEPS ('k') | chrome/browser/download/download_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698