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

Side by Side Diff: chrome/test/automation/proxy_launcher.cc

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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/test/automation/proxy_launcher.h" 5 #include "chrome/test/automation/proxy_launcher.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/string_split.h"
12 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
13 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h"
14 #include "base/test/test_file_util.h" 14 #include "base/test/test_file_util.h"
15 #include "base/test/test_timeouts.h" 15 #include "base/test/test_timeouts.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/common/automation_constants.h" 18 #include "chrome/common/automation_constants.h"
19 #include "chrome/common/chrome_constants.h" 19 #include "chrome/common/chrome_constants.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/logging_chrome.h" 21 #include "chrome/common/logging_chrome.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chrome/test/automation/automation_proxy.h" 23 #include "chrome/test/automation/automation_proxy.h"
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 return LaunchBrowserAndServer(state, wait_for_initial_loads); 592 return LaunchBrowserAndServer(state, wait_for_initial_loads);
593 } 593 }
594 594
595 void AnonymousProxyLauncher::TerminateConnection() { 595 void AnonymousProxyLauncher::TerminateConnection() {
596 CloseBrowserAndServer(); 596 CloseBrowserAndServer();
597 } 597 }
598 598
599 std::string AnonymousProxyLauncher::PrefixedChannelID() const { 599 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
600 return channel_id_; 600 return channel_id_;
601 } 601 }
OLDNEW
« no previous file with comments | « chrome/service/cloud_print/cloud_print_connector.cc ('k') | chrome/test/base/chrome_process_util_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698