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

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

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h"
6
7 #if defined(OS_WIN)
James Hawkins 2010/12/22 21:54:36 According to the style guide, platform-specific he
Lei Zhang 2011/01/08 01:51:36 Done.
8 #include <shlwapi.h>
9 #endif
10
5 #include <sstream> 11 #include <sstream>
6 #include <string> 12 #include <string>
7 13
8 #include "build/build_config.h"
9 #if defined(OS_WIN)
10 #include <shlwapi.h>
11 #endif
12
13 #include "base/command_line.h" 14 #include "base/command_line.h"
14 #include "base/file_util.h" 15 #include "base/file_util.h"
15 #include "base/path_service.h" 16 #include "base/path_service.h"
16 #include "base/platform_thread.h" 17 #include "base/platform_thread.h"
17 #include "base/string_util.h" 18 #include "base/string_util.h"
18 #include "base/test/test_file_util.h" 19 #include "base/test/test_file_util.h"
19 #include "chrome/app/chrome_command_ids.h" 20 #include "chrome/app/chrome_command_ids.h"
20 #include "chrome/browser/download/download_util.h" 21 #include "chrome/browser/download/download_util.h"
21 #include "chrome/browser/net/url_request_mock_http_job.h" 22 #include "chrome/browser/net/url_request_mock_http_job.h"
22 #include "chrome/browser/net/url_request_slow_download_job.h" 23 #include "chrome/browser/net/url_request_slow_download_job.h"
23 #include "chrome/common/chrome_constants.h" 24 #include "chrome/common/chrome_constants.h"
24 #include "chrome/common/chrome_paths.h" 25 #include "chrome/common/chrome_paths.h"
25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/test/ui/ui_test.h" 26 #include "chrome/test/ui/ui_test.h"
27 #include "chrome/test/automation/tab_proxy.h" 27 #include "chrome/test/automation/tab_proxy.h"
28 #include "chrome/test/automation/browser_proxy.h" 28 #include "chrome/test/automation/browser_proxy.h"
29 #include "net/base/net_util.h" 29 #include "net/base/net_util.h"
30 #include "net/url_request/url_request_unittest.h" 30 #include "net/url_request/url_request_unittest.h"
31 31
32 namespace { 32 namespace {
33 33
34 const wchar_t kDocRoot[] = L"chrome/test/data"; 34 const wchar_t kDocRoot[] = L"chrome/test/data";
35 35
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 CleanupDownloadFiles(file); 516 CleanupDownloadFiles(file);
517 ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition( 517 ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
518 URLRequestMockHTTPJob::GetMockUrl(file), NEW_WINDOW)); 518 URLRequestMockHTTPJob::GetMockUrl(file), NEW_WINDOW));
519 519
520 ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2)); 520 ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
521 521
522 CheckDownload(file); 522 CheckDownload(file);
523 } 523 }
524 524
525 } // namespace 525 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698