diff options
67 files changed, 185 insertions, 62 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index c046125..b11902b 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -104,6 +104,13 @@ void CommandLine::ParseFromString(const std::wstring& command_line) { LocalFree(args); } +// static +CommandLine CommandLine::FromString(const std::wstring& command_line) { + CommandLine cmd; + cmd.ParseFromString(command_line); + return cmd; +} + CommandLine::CommandLine(const FilePath& program) { if (!program.empty()) { program_ = program.value(); @@ -117,6 +124,14 @@ CommandLine::CommandLine(ArgumentsOnly args_only) { argv_.push_back(""); } +CommandLine::CommandLine(int argc, const char* const* argv) { + InitFromArgv(argc, argv); +} + +CommandLine::CommandLine(const std::vector<std::string>& argv) { + InitFromArgv(argv); +} + void CommandLine::InitFromArgv(int argc, const char* const* argv) { for (int i = 0; i < argc; ++i) argv_.push_back(argv[i]); @@ -265,6 +280,20 @@ bool CommandLine::HasSwitch(const std::string& switch_string) const { return switches_.find(lowercased_switch) != switches_.end(); } +bool CommandLine::HasSwitch(const std::wstring& switch_string) const { + return HasSwitch(WideToASCII(switch_string)); +} + +std::string CommandLine::GetSwitchValueASCII( + const std::string& switch_string) const { + return WideToASCII(GetSwitchValue(switch_string)); +} + +FilePath CommandLine::GetSwitchValuePath( + const std::string& switch_string) const { + return FilePath::FromWStringHack(GetSwitchValue(switch_string)); +} + std::wstring CommandLine::GetSwitchValue( const std::string& switch_string) const { std::string lowercased_switch(switch_string); @@ -286,6 +315,15 @@ std::wstring CommandLine::GetSwitchValue( } } +std::wstring CommandLine::GetSwitchValue( + const std::wstring& switch_string) const { + return GetSwitchValue(WideToASCII(switch_string)); +} + +FilePath CommandLine::GetProgram() const { + return FilePath::FromWStringHack(program()); +} + #if defined(OS_WIN) std::wstring CommandLine::program() const { return program_; @@ -432,6 +470,11 @@ void CommandLine::PrependWrapper(const std::wstring& wrapper_wide) { #endif +void CommandLine::AppendSwitchWithValue(const std::string& switch_string, + const std::string& value_string) { + AppendSwitchWithValue(switch_string, ASCIIToWide(value_string)); +} + // private CommandLine::CommandLine() { } diff --git a/base/command_line.h b/base/command_line.h index b7f01f3..7ef83bc 100644 --- a/base/command_line.h +++ b/base/command_line.h @@ -24,10 +24,9 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/logging.h" -#include "base/string_util.h" +class FilePath; class InProcessBrowserTest; class CommandLine { @@ -44,11 +43,7 @@ class CommandLine { // Initialize by parsing the given command-line string. // The program name is assumed to be the first item in the string. void ParseFromString(const std::wstring& command_line); - static CommandLine FromString(const std::wstring& command_line) { - CommandLine cmd; - cmd.ParseFromString(command_line); - return cmd; - } + static CommandLine FromString(const std::wstring& command_line); #elif defined(OS_POSIX) // The type of native command line arguments. typedef std::string StringType; @@ -57,12 +52,8 @@ class CommandLine { void InitFromArgv(int argc, const char* const* argv); void InitFromArgv(const std::vector<std::string>& argv); - CommandLine(int argc, const char* const* argv) { - InitFromArgv(argc, argv); - } - explicit CommandLine(const std::vector<std::string>& argv) { - InitFromArgv(argv); - } + CommandLine(int argc, const char* const* argv); + explicit CommandLine(const std::vector<std::string>& argv); #endif // Construct a new, empty command line. @@ -105,27 +96,19 @@ class CommandLine { bool HasSwitch(const std::string& switch_string) const; // Deprecated version of the above. - bool HasSwitch(const std::wstring& switch_string) const { - return HasSwitch(WideToASCII(switch_string)); - } + bool HasSwitch(const std::wstring& switch_string) const; // Returns the value associated with the given switch. If the // switch has no value or isn't present, this method returns // the empty string. // TODO(evanm): move these into command_line.cpp once we've fixed the // wstringness. - std::string GetSwitchValueASCII(const std::string& switch_string) const { - return WideToASCII(GetSwitchValue(switch_string)); - } - FilePath GetSwitchValuePath(const std::string& switch_string) const { - return FilePath::FromWStringHack(GetSwitchValue(switch_string)); - } + std::string GetSwitchValueASCII(const std::string& switch_string) const; + FilePath GetSwitchValuePath(const std::string& switch_string) const; // Deprecated versions of the above. std::wstring GetSwitchValue(const std::string& switch_string) const; - std::wstring GetSwitchValue(const std::wstring& switch_string) const { - return GetSwitchValue(WideToASCII(switch_string)); - } + std::wstring GetSwitchValue(const std::wstring& switch_string) const; // Get the number of switches in this process. size_t GetSwitchCount() const { return switches_.size(); } @@ -134,7 +117,7 @@ class CommandLine { typedef std::map<std::string, StringType> SwitchMap; // Get a copy of all switches, along with their values - SwitchMap GetSwitches() const { + const SwitchMap& GetSwitches() const { return switches_; } @@ -157,9 +140,7 @@ class CommandLine { #endif // Returns the program part of the command line string (the first item). - FilePath GetProgram() const { - return FilePath::FromWStringHack(program()); - } + FilePath GetProgram() const; // Returns the program part of the command line string (the first item). // Deprecated version of the above. @@ -184,9 +165,7 @@ class CommandLine { void AppendSwitchWithValue(const std::string& switch_string, const std::wstring& value_string); void AppendSwitchWithValue(const std::string& switch_string, - const std::string& value_string) { - AppendSwitchWithValue(switch_string, ASCIIToWide(value_string)); - } + const std::string& value_string); // Append a loose value to the command line. void AppendLooseValue(const std::wstring& value); diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc index 8f3c7c0..c3fb04c 100644 --- a/base/command_line_unittest.cc +++ b/base/command_line_unittest.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/basictypes.h" +#include "base/file_path.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/data_pack.cc b/base/data_pack.cc index 06f2308..c130031 100644 --- a/base/data_pack.cc +++ b/base/data_pack.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/ref_counted_memory.h" #include "base/string_piece.h" // For details of the file layout, see diff --git a/base/data_pack.h b/base/data_pack.h index 33f8b0f..2836715 100644 --- a/base/data_pack.h +++ b/base/data_pack.h @@ -13,13 +13,13 @@ #include <map> #include "base/basictypes.h" -#include "base/ref_counted_memory.h" #include "base/scoped_ptr.h" namespace file_util { class MemoryMappedFile; } class FilePath; +class RefCountedStaticMemory; namespace base { diff --git a/base/histogram.cc b/base/histogram.cc index 2206756..31cc6a5 100644 --- a/base/histogram.cc +++ b/base/histogram.cc @@ -84,6 +84,10 @@ Histogram::~Histogram() { DCHECK(ValidateBucketRanges()); } +bool Histogram::PrintEmptyBucket(size_t index) const { + return true; +} + void Histogram::Add(int value) { if (value >= kSampleType_MAX) value = kSampleType_MAX - 1; @@ -95,10 +99,18 @@ void Histogram::Add(int value) { Accumulate(value, 1, index); } +void Histogram::AddBoolean(bool value) { + DCHECK(false); +} + void Histogram::AddSampleSet(const SampleSet& sample) { sample_.Add(sample); } +void Histogram::SetRangeDescriptions(const DescriptionPair descriptions[]) { + DCHECK(false); +} + // The following methods provide a graphical histogram display. void Histogram::WriteHTMLGraph(std::string* output) const { // TBD(jar) Write a nice HTML bar chart, with divs an mouse-overs etc. @@ -290,6 +302,20 @@ void Histogram::SnapshotSample(SampleSet* sample) const { *sample = sample_; } +bool Histogram::HasConstructorArguments(Sample minimum, Sample maximum, + size_t bucket_count) { + return ((minimum == declared_min_) && (maximum == declared_max_) && + (bucket_count == bucket_count_)); +} + +bool Histogram::HasConstructorTimeDeltaArguments(base::TimeDelta minimum, + base::TimeDelta maximum, + size_t bucket_count) { + return ((minimum.InMilliseconds() == declared_min_) && + (maximum.InMilliseconds() == declared_max_) && + (bucket_count == bucket_count_)); +} + //------------------------------------------------------------------------------ // Accessor methods @@ -613,6 +639,10 @@ LinearHistogram::LinearHistogram(const std::string& name, DCHECK(ValidateBucketRanges()); } +Histogram::ClassType LinearHistogram::histogram_type() const { + return LINEAR_HISTOGRAM; +} + void LinearHistogram::SetRangeDescriptions( const DescriptionPair descriptions[]) { for (int i =0; descriptions[i].description; ++i) { @@ -671,6 +701,17 @@ scoped_refptr<Histogram> BooleanHistogram::FactoryGet(const std::string& name, return histogram; } +Histogram::ClassType BooleanHistogram::histogram_type() const { + return BOOLEAN_HISTOGRAM; +} + +void BooleanHistogram::AddBoolean(bool value) { + Add(value ? 1 : 0); +} + +BooleanHistogram::BooleanHistogram(const std::string& name) + : LinearHistogram(name, 1, 2, 3) { +} //------------------------------------------------------------------------------ // CustomHistogram: @@ -706,6 +747,10 @@ scoped_refptr<Histogram> CustomHistogram::FactoryGet( return histogram; } +Histogram::ClassType CustomHistogram::histogram_type() const { + return CUSTOM_HISTOGRAM; +} + CustomHistogram::CustomHistogram(const std::string& name, const std::vector<int>& custom_ranges) : Histogram(name, custom_ranges[1], custom_ranges.back(), diff --git a/base/histogram.h b/base/histogram.h index 441507b..1d13544 100644 --- a/base/histogram.h +++ b/base/histogram.h @@ -319,7 +319,7 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { void Add(int value); // This method is an interface, used only by BooleanHistogram. - virtual void AddBoolean(bool value) { DCHECK(false); } + virtual void AddBoolean(bool value); // Accept a TimeDelta to increment. void AddTime(base::TimeDelta time) { @@ -329,8 +329,7 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { void AddSampleSet(const SampleSet& sample); // This method is an interface, used only by LinearHistogram. - virtual void SetRangeDescriptions(const DescriptionPair descriptions[]) - { DCHECK(false); } + virtual void SetRangeDescriptions(const DescriptionPair descriptions[]); // The following methods provide graphical histogram displays. void WriteHTMLGraph(std::string* output) const; @@ -373,17 +372,11 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { virtual void SnapshotSample(SampleSet* sample) const; virtual bool HasConstructorArguments(Sample minimum, Sample maximum, - size_t bucket_count) { - return ((minimum == declared_min_) && (maximum == declared_max_) && - (bucket_count == bucket_count_)); - } + size_t bucket_count); virtual bool HasConstructorTimeDeltaArguments(base::TimeDelta minimum, - base::TimeDelta maximum, size_t bucket_count) { - return ((minimum.InMilliseconds() == declared_min_) && - (maximum.InMilliseconds() == declared_max_) && - (bucket_count == bucket_count_)); - } + base::TimeDelta maximum, + size_t bucket_count); protected: friend class base::RefCountedThreadSafe<Histogram>; @@ -395,7 +388,7 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { virtual ~Histogram(); // Method to override to skip the display of the i'th bucket if it's empty. - virtual bool PrintEmptyBucket(size_t index) const { return true; } + virtual bool PrintEmptyBucket(size_t index) const; //---------------------------------------------------------------------------- // Methods to override to create histogram with different bucket widths. @@ -488,7 +481,7 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { // buckets. class LinearHistogram : public Histogram { public: - virtual ClassType histogram_type() const { return LINEAR_HISTOGRAM; } + virtual ClassType histogram_type() const; // Store a list of number/text values for use in rendering the histogram. // The last element in the array has a null in its "description" slot. @@ -539,14 +532,12 @@ class BooleanHistogram : public LinearHistogram { static scoped_refptr<Histogram> FactoryGet(const std::string& name, Flags flags); - virtual ClassType histogram_type() const { return BOOLEAN_HISTOGRAM; } + virtual ClassType histogram_type() const; - virtual void AddBoolean(bool value) { Add(value ? 1 : 0); } + virtual void AddBoolean(bool value); private: - explicit BooleanHistogram(const std::string& name) - : LinearHistogram(name, 1, 2, 3) { - } + explicit BooleanHistogram(const std::string& name); DISALLOW_COPY_AND_ASSIGN(BooleanHistogram); }; @@ -556,7 +547,7 @@ class BooleanHistogram : public LinearHistogram { // CustomHistogram is a histogram for a set of custom integers. class CustomHistogram : public Histogram { public: - virtual ClassType histogram_type() const { return CUSTOM_HISTOGRAM; } + virtual ClassType histogram_type() const; static scoped_refptr<Histogram> FactoryGet(const std::string& name, const std::vector<int>& custom_ranges, Flags flags); diff --git a/base/process_posix.cc b/base/process_posix.cc index 904884a..ee70e5a 100644 --- a/base/process_posix.cc +++ b/base/process_posix.cc @@ -9,6 +9,7 @@ #include <sys/resource.h> #include "base/process_util.h" +#include "base/logging.h" namespace base { diff --git a/base/process_util.h b/base/process_util.h index d7ff940..4cb954b 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -33,9 +33,7 @@ typedef struct _malloc_zone_t malloc_zone_t; #include <utility> #include <vector> -#include "base/command_line.h" #include "base/file_descriptor_shuffle.h" -#include "base/file_path.h" #include "base/process.h" #ifndef NAME_MAX // Solaris and some BSDs have no NAME_MAX @@ -46,6 +44,9 @@ typedef struct _malloc_zone_t malloc_zone_t; #endif #endif +class CommandLine; +class FilePath; + namespace base { #if defined(OS_WIN) diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index cae70a5..3455a43 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -16,6 +16,7 @@ #include <limits> #include <set> +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug_util.h" #include "base/dir_reader_posix.h" @@ -25,6 +26,7 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/scoped_ptr.h" +#include "base/string_util.h" #include "base/time.h" #include "base/waitable_event.h" diff --git a/base/process_util_win.cc b/base/process_util_win.cc index 2eb73ca..428fe25 100644 --- a/base/process_util_win.cc +++ b/base/process_util_win.cc @@ -12,6 +12,7 @@ #include <ios> +#include "base/command_line.h" #include "base/debug_util.h" #include "base/histogram.h" #include "base/logging.h" diff --git a/base/test/test_suite.h b/base/test/test_suite.h index ce40d9a..3c40fd1 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -14,6 +14,7 @@ #include "base/base_paths.h" #include "base/debug_on_start.h" #include "base/debug_util.h" +#include "base/file_path.h" #include "base/i18n/icu_util.h" #include "base/multiprocess_test.h" #include "base/nss_util.h" diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 0a5fed1..e0af23c 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -5,6 +5,8 @@ #include <windows.h> #include <shlwapi.h> +#include "base/command_line.h" +#include "base/logging.h" #include "base/file_util.h" #include "chrome/app/breakpad_win.h" #include "chrome/app/client_util.h" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 14e748f..bc7024b 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -11,6 +11,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" +#include "base/command_line.h" #include "base/file_version_info.h" #include "base/histogram.h" #include "base/i18n/number_formatting.h" diff --git a/chrome/browser/browser_init_browsertest.cc b/chrome/browser/browser_init_browsertest.cc index 8d130fc..eb357a8 100644 --- a/chrome/browser/browser_init_browsertest.cc +++ b/chrome/browser/browser_init_browsertest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_init.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index e8b668b..a96b740 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -7,6 +7,7 @@ #include <string> #include "app/resource_bundle.h" +#include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/histogram.h" diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index aa19232..edc43f3 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -6,6 +6,7 @@ #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" +#include "base/string_util.h" #include "chrome/browser/browser_theme_pack.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index 2e95a20..2c327270 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -20,6 +20,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/scoped_ptr.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library_loader.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 2d33535..8fffad3 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -10,6 +10,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/command_line.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc index dfcd797..01efdbc 100644 --- a/chrome/browser/chromeos/login/image_downloader.cc +++ b/chrome/browser/chromeos/login/image_downloader.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" +#include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/profile_manager.h" diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 01b615c..a01bbd7 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "chrome/browser/automation/ui_controls.h" diff --git a/chrome/browser/configuration_policy_pref_store_unittest.cc b/chrome/browser/configuration_policy_pref_store_unittest.cc index 0e74c94..0762a6f 100644 --- a/chrome/browser/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/configuration_policy_pref_store_unittest.cc @@ -5,6 +5,7 @@ #include <gtest/gtest.h> #include "base/command_line.h" +#include "base/file_path.h" #include "chrome/browser/configuration_policy_pref_store.h" #include "chrome/browser/mock_configuration_policy_provider.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/extension_context_menu_api.cc b/chrome/browser/extensions/extension_context_menu_api.cc index 5652245..9b7a3a8 100644 --- a/chrome/browser/extensions/extension_context_menu_api.cc +++ b/chrome/browser/extensions/extension_context_menu_api.cc @@ -7,6 +7,7 @@ #include <string> #include "base/values.h" +#include "base/string_util.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index 5fb2886..bfcec8d 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -12,6 +12,7 @@ #include "chrome/installer/util/install_util.h" #endif +#include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run_gtk.cc index 4b61867..0142c7e 100644 --- a/chrome/browser/first_run_gtk.cc +++ b/chrome/browser/first_run_gtk.cc @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/string_util.h" #include "chrome/browser/gtk/first_run_dialog.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index d551105..638d39e 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -13,6 +13,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stl_util-inl.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc index 42c23ac..060015d 100644 --- a/chrome/browser/importer/firefox_importer_unittest.cc +++ b/chrome/browser/importer/firefox_importer_unittest.cc @@ -7,6 +7,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/browser/importer/firefox_importer_unittest_utils.h" diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 1dce41e9..85095ee 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -21,6 +21,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stl_util-inl.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc index 0bc6ab5..ea5c5e9 100644 --- a/chrome/browser/importer/toolbar_importer_unittest.cc +++ b/chrome/browser/importer/toolbar_importer_unittest.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/string16.h" +#include "base/string_util.h" #include "chrome/browser/first_run.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/toolbar_importer.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 13db75d..44a41b8 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -164,6 +164,7 @@ #endif #include "base/base64.h" +#include "base/command_line.h" #include "base/histogram.h" #include "base/md5.h" #include "base/thread.h" diff --git a/chrome/browser/platform_util_common_linux.cc b/chrome/browser/platform_util_common_linux.cc index 40edb70..43c588f 100644 --- a/chrome/browser/platform_util_common_linux.cc +++ b/chrome/browser/platform_util_common_linux.cc @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/process_watcher.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc index 732f22e..e7ff4db 100644 --- a/chrome/browser/process_info_snapshot_mac.cc +++ b/chrome/browser/process_info_snapshot_mac.cc @@ -6,6 +6,7 @@ #include <sstream> +#include "base/command_line.h" #include "base/logging.h" #include "base/string_util.h" #include "base/thread.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 724d7bb..9512d64 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -8,6 +8,7 @@ #include "app/surface/io_surface_support_mac.h" #import "base/chrome_application_mac.h" +#include "base/command_line.h" #include "base/histogram.h" #include "base/logging.h" #import "base/scoped_nsobject.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc index 73f991d..b9e8a06 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc @@ -11,6 +11,7 @@ #include "base/process_util.h" #include "base/sha2.h" #include "base/stats_counters.h" +#include "base/string_util.h" #include "chrome/browser/safe_browsing/bloom_filter.h" #include "chrome/common/sqlite_compiled_statement.h" #include "chrome/common/sqlite_utils.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 492bb06..1db24b2 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index cf46e379..a2b8aa8 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -24,6 +24,7 @@ #include "base/process_util.h" #include "base/scoped_temp_dir.h" #include "base/string_tokenizer.h" +#include "base/string_util.h" #include "base/task.h" #include "base/thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index 8001797..eca03c6 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -11,6 +11,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "base/task.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc index 97118d2..a95b172b 100644 --- a/chrome/browser/views/task_manager_view.cc +++ b/chrome/browser/views/task_manager_view.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" #include "app/table_model_observer.h" +#include "base/command_line.h" #include "base/stats_table.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 930c933..9ddfa7e 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -4,6 +4,7 @@ #include "chrome/browser/web_resource/web_resource_service.h" #include "base/command_line.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc index 51a658e..dee2839 100644 --- a/chrome/browser/zygote_main_linux.cc +++ b/chrome/browser/zygote_main_linux.cc @@ -21,6 +21,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/eintr_wrapper.h" +#include "base/file_path.h" #include "base/global_descriptors_posix.h" #include "base/hash_tables.h" #include "base/linux_util.h" diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc index 08be12b..2b2b72d 100644 --- a/chrome/common/chrome_plugin_util.cc +++ b/chrome/common/chrome_plugin_util.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index c3bdb77..9591170 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -38,6 +38,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/common/sandbox_mac.mm b/chrome/common/sandbox_mac.mm index 31c4463..c514a10 100644 --- a/chrome/common/sandbox_mac.mm +++ b/chrome/common/sandbox_mac.mm @@ -20,6 +20,7 @@ extern "C" { #include "base/scoped_cftyperef.h" #include "base/scoped_nsautorelease_pool.h" #include "base/string16.h" +#include "base/string_util.h" #include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 133aba7..f1bad6f 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -12,6 +12,7 @@ #include <msi.h> #include <sddl.h> +#include "base/command_line.h" #include "base/file_path.h" #include "base/path_service.h" #include "base/rand_util.h" diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc index e03c25b..3f11eb5 100644 --- a/chrome/installer/util/logging_installer.cc +++ b/chrome/installer/util/logging_installer.cc @@ -10,6 +10,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/string_util.h" #include "chrome/installer/util/util_constants.h" namespace installer { diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h index a3d3466..0f4bc58 100644 --- a/chrome/test/live_sync/live_autofill_sync_test.h +++ b/chrome/test/live_sync/live_autofill_sync_test.h @@ -10,6 +10,7 @@ #include <set> #include <vector> +#include "base/command_line.h" #include "chrome/browser/autofill/autofill_common_unittest.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/autofill_type.h" diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index d2d8b16..761aece 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -6,6 +6,7 @@ #include <vector> +#include "base/command_line.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc index 63c2f0b..8a5c08c 100644 --- a/chrome/test/mini_installer_test/mini_installer_test_util.cc +++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc @@ -8,6 +8,7 @@ #include "base/path_service.h" #include "base/platform_thread.h" #include "base/process_util.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/installer/util/logging_installer.h" diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index c464229..eb992b6 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -6,6 +6,7 @@ #include <vector> +#include "base/command_line.h" #include "base/file_path.h" #include "base/json/json_reader.h" #include "base/message_loop.h" diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc index c577d1e..835fc35 100644 --- a/chrome_frame/chrome_launcher_unittest.cc +++ b/chrome_frame/chrome_launcher_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/file_path.h" #include "base/logging.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/chrome_launcher.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 6b03bf4..8b041a6 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -9,6 +9,7 @@ #include <iepmapi.h> #include <sddl.h> +#include "base/command_line.h" #include "base/file_version_info.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -19,6 +20,7 @@ #include "base/scoped_bstr_win.h" #include "base/scoped_handle.h" #include "base/scoped_comptr_win.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/common/chrome_switches.h" @@ -958,6 +960,11 @@ void DelaySendExtendedKeysEnter(TimedMsgLoop* loop, int delay, char c, simulate_input::SendCharA, VK_RETURN, simulate_input::NONE), next_delay); } +CloseIeAtEndOfScope::~CloseIeAtEndOfScope() { + int closed = CloseAllIEWindows(); + DLOG_IF(ERROR, closed != 0) << "Closed " << closed << " windows forcefully"; +} + base::ProcessHandle StartCrashService() { FilePath exe_dir; if (!PathService::Get(base::DIR_EXE, &exe_dir)) { diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 13177fc..4b74f1e 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -374,11 +374,7 @@ void DelaySendExtendedKeysEnter(TimedMsgLoop* loop, int delay, char c, class CloseIeAtEndOfScope { public: CloseIeAtEndOfScope() {} - ~CloseIeAtEndOfScope() { - int closed = CloseAllIEWindows(); - DLOG_IF(ERROR, closed != 0) - << StringPrintf("Closed %i windows forcefully", closed); - } + ~CloseIeAtEndOfScope(); }; // Starts the Chrome crash service which enables us to gather crash dumps diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc index 2f7d32c..c04c3c8 100644 --- a/chrome_frame/test/ie_event_sink.cc +++ b/chrome_frame/test/ie_event_sink.cc @@ -6,6 +6,7 @@ #include "base/scoped_bstr_win.h" #include "base/scoped_handle.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome_frame/test/chrome_frame_test_utils.h" @@ -542,4 +543,4 @@ HRESULT IEEventSink::OnMessage(const VARIANT* param) { return S_OK; } -} // namespace chrome_frame_test
\ No newline at end of file +} // namespace chrome_frame_test diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index 46e2de0..2413b7f 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -5,6 +5,7 @@ #include "media/filters/ffmpeg_video_decode_engine.h" #include "base/command_line.h" +#include "base/string_util.h" #include "base/task.h" #include "media/base/buffers.h" #include "media/base/callback.h" diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index a967bc3..69bfc80 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -15,8 +15,9 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/md5.h" -#include "base/utf_string_conversions.h" +#include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "media/base/djb2.h" #include "media/base/media.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index cdc2560..7e33b81 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -25,6 +25,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/md5.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "media/base/djb2.h" diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc index 5203eb0..0d7e972 100644 --- a/media/tools/omx_test/omx_test.cc +++ b/media/tools/omx_test/omx_test.cc @@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" +#include "base/string_util.h" #include "base/time.h" #include "media/base/data_buffer.h" #include "media/base/media.h" diff --git a/media/tools/scaler_bench/scaler_bench.cc b/media/tools/scaler_bench/scaler_bench.cc index b5d2ae1..2208a17 100644 --- a/media/tools/scaler_bench/scaler_bench.cc +++ b/media/tools/scaler_bench/scaler_bench.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/scoped_vector.h" +#include "base/string_util.h" #include "base/time.h" #include "media/base/video_frame.h" #include "media/base/yuv_convert.h" diff --git a/media/tools/wav_ola_test/wav_ola_test.cc b/media/tools/wav_ola_test/wav_ola_test.cc index 4c006c3..0c6b214 100644 --- a/media/tools/wav_ola_test/wav_ola_test.cc +++ b/media/tools/wav_ola_test/wav_ola_test.cc @@ -16,6 +16,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/ref_counted.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "media/base/data_buffer.h" #include "media/filters/audio_renderer_algorithm_ola.h" diff --git a/net/test/test_server.cc b/net/test/test_server.cc index ff4d4dc..3432368 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -21,6 +21,7 @@ #include "base/leak_annotations.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/cert_test_util.h" #include "net/base/host_resolver.h" diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index e98b95d..e055577 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -27,6 +27,7 @@ #include <string> #include "base/at_exit.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/icu_util.h" #include "base/logging.h" diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index ccf356c..512b37f 100644 --- a/tools/imagediff/image_diff.cc +++ b/tools/imagediff/image_diff.cc @@ -20,6 +20,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/scoped_ptr.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/codec/png_codec.h" diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index cb02329..82cc144 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -7,6 +7,7 @@ #include "app/app_paths.h" #include "app/resource_bundle.h" #include "base/at_exit.h" +#include "base/command_line.h" #include "base/i18n/icu_util.h" #include "base/process_util.h" #include "views/controls/label.h" diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index b05e7d9f..19abb0c 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -18,6 +18,7 @@ #include "base/platform_file.h" #include "base/singleton.h" #include "base/stats_counters.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/trace_event.h" diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index a2b4507..f05a5e5 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -18,6 +18,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stats_table.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "gfx/codec/png_codec.h" diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 0b2a0f8..845f04c 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -18,6 +18,7 @@ #include "base/resource_util.h" #include "base/stack_container.h" #include "base/string_piece.h" +#include "base/string_util.h" #include "base/trace_event.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index cc5ced31..25ebd83 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -11,6 +11,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "base/string_util.h" #include "base/trace_event.h" #include "base/utf_string_conversions.h" #include "gfx/native_widget_types.h" |