diff options
Diffstat (limited to 'chrome')
46 files changed, 181 insertions, 169 deletions
diff --git a/chrome/common/gfx/chrome_font_skia.cc b/chrome/common/gfx/chrome_font_skia.cc index a309649..bd83a61 100644 --- a/chrome/common/gfx/chrome_font_skia.cc +++ b/chrome/common/gfx/chrome_font_skia.cc @@ -78,7 +78,8 @@ int ChromeFont::ave_char_width() const { return avg_width_; } -ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, int font_size) { +ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, + int font_size) { DCHECK_GT(font_size, 0); SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_name).c_str(), diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc index cdb4c0c..237e082 100644 --- a/chrome/common/gfx/color_utils.cc +++ b/chrome/common/gfx/color_utils.cc @@ -35,7 +35,8 @@ static const double kK = 903.3; static double CIEConvertNonLinear(uint8 color_component) { double color_component_d = static_cast<double>(color_component) / 255.0; if (color_component_d > 0.04045) { - double base = (color_component_d + kCIEConversionAlpha) / (1 + kCIEConversionAlpha); + double base = (color_component_d + kCIEConversionAlpha) / + (1 + kCIEConversionAlpha); return pow(base, kCIEConversionGamma); } else { return color_component_d / 12.92; @@ -86,7 +87,9 @@ static uint8 sRGBColorComponentFromLinearComponent(double component) { if (component <= 0.0031308) { result = 12.92 * component; } else { - result = (1 + kCIEConversionAlpha) * pow(component, (static_cast<double>(1) / 2.4)) - kCIEConversionAlpha; + result = (1 + kCIEConversionAlpha) * + pow(component, (static_cast<double>(1) / 2.4)) - + kCIEConversionAlpha; } return std::min(static_cast<uint8>(255), static_cast<uint8>(result * 255)); } diff --git a/chrome/common/gfx/text_elider.cc b/chrome/common/gfx/text_elider.cc index f4a6d4e..9510a8e 100644 --- a/chrome/common/gfx/text_elider.cc +++ b/chrome/common/gfx/text_elider.cc @@ -376,7 +376,8 @@ void AppendFormattedComponent(const std::string& spec, out_component->begin = static_cast<int>(output->length()); output->append(UnescapeAndDecodeUTF8URLComponent( - spec.substr(in_component.begin, in_component.len), UnescapeRule::NORMAL)); + spec.substr(in_component.begin, in_component.len), + UnescapeRule::NORMAL)); out_component->len = static_cast<int>(output->length()) - out_component->begin; diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc index 2c13dde..5f02b1c 100644 --- a/chrome/common/l10n_util.cc +++ b/chrome/common/l10n_util.cc @@ -376,7 +376,8 @@ std::wstring TruncateString(const std::wstring& string, size_t length) { // Use a line iterator to find the first boundary. UErrorCode status = U_ZERO_ERROR; scoped_ptr<RuleBasedBreakIterator> bi(static_cast<RuleBasedBreakIterator*>( - RuleBasedBreakIterator::createLineInstance(Locale::getDefault(), status))); + RuleBasedBreakIterator::createLineInstance(Locale::getDefault(), + status))); if (U_FAILURE(status)) return string.substr(0, max) + kElideString; bi->setText(string_utf16.c_str()); diff --git a/chrome/common/libxml_utils.h b/chrome/common/libxml_utils.h index 890b8e2..3089bd4 100644 --- a/chrome/common/libxml_utils.h +++ b/chrome/common/libxml_utils.h @@ -163,7 +163,7 @@ class XmlWriter { BAD_CAST content.c_str()) >= 0; } - // Helper functions not provided by xmlTextWriter ---------------------------------- + // Helper functions not provided by xmlTextWriter --------------------------- // Returns the string that has been written to the buffer. std::string GetWrittenString() { diff --git a/chrome/common/mach_ipc_mac.h b/chrome/common/mach_ipc_mac.h index 74b84cf..8c345dd 100644 --- a/chrome/common/mach_ipc_mac.h +++ b/chrome/common/mach_ipc_mac.h @@ -63,8 +63,8 @@ // // char messageString[] = "Hello server!\n"; // message.SetData(messageString, strlen(messageString)+1); -// -// kern_return_t result = sender.SendMessage(message, 1000); // timeout 1000ms +// // timeout 1000ms +// kern_return_t result = sender.SendMessage(message, 1000); // #define PRINT_MACH_RESULT(result_, message_) \ @@ -194,9 +194,9 @@ class MachMessage { // Represents raw data in our message struct MessageDataPacket { - int32_t id; // little-endian - int32_t data_length; // little-endian - u_int8_t data[1]; // actual size limited by storage_length_bytes_ + int32_t id; // little-endian + int32_t data_length; // little-endian + u_int8_t data[1]; // actual size limited by storage_length_bytes_ }; MessageDataPacket* GetDataPacket(); @@ -222,7 +222,8 @@ class MachMessage { u_int8_t padding[1024]; }; - // kEmptyMessageSize needs to have the definition of MachMessageData before it.NNN + // kEmptyMessageSize needs to have the definition of MachMessageData before + // it. public: // The size of an empty message with no data. static const size_t kEmptyMessageSize = sizeof(mach_msg_header_t) + diff --git a/chrome/common/message_router.cc b/chrome/common/message_router.cc index a05e42d..9e62b71 100644 --- a/chrome/common/message_router.cc +++ b/chrome/common/message_router.cc @@ -6,11 +6,13 @@ #include "chrome/common/render_messages.h" void MessageRouter::OnControlMessageReceived(const IPC::Message& msg) { - NOTREACHED() << "should override in subclass if you care about control messages"; + NOTREACHED() << + "should override in subclass if you care about control messages"; } bool MessageRouter::Send(IPC::Message* msg) { - NOTREACHED() << "should override in subclass if you care about sending messages"; + NOTREACHED() << + "should override in subclass if you care about sending messages"; return false; } diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc index 733967e..fb1f15b 100644 --- a/chrome/common/net/url_request_intercept_job.cc +++ b/chrome/common/net/url_request_intercept_job.cc @@ -144,7 +144,8 @@ void URLRequestInterceptJob::GetResponseInfo(net::HttpResponseInfo* info) { new net::X509Certificate(request_->url().GetWithEmptyPath().spec(), kCertIssuer, Time::Now(), - Time::Now() + TimeDelta::FromDays(kLifetimeDays)); + Time::Now() + + TimeDelta::FromDays(kLifetimeDays)); info->ssl_info.cert_status = 0; info->ssl_info.security_bits = 0; } diff --git a/chrome/common/notification_service_unittest.cc b/chrome/common/notification_service_unittest.cc index db46356..0c948d6 100644 --- a/chrome/common/notification_service_unittest.cc +++ b/chrome/common/notification_service_unittest.cc @@ -141,8 +141,9 @@ TEST(NotificationServiceTest, Basic) { EXPECT_EQ(1, idle_test_source.notification_count()); // Removing an observer that isn't there is a no-op, this should be fine. - service->RemoveObserver( - &all_types_all_sources, NotificationType::ALL, NotificationService::AllSources()); + service->RemoveObserver(&all_types_all_sources, + NotificationType::ALL, + NotificationService::AllSources()); } TEST(NotificationServiceTest, MultipleRegistration) { @@ -152,26 +153,30 @@ TEST(NotificationServiceTest, MultipleRegistration) { NotificationService* service = NotificationService::current(); - service->AddObserver( - &idle_test_source, NotificationType::IDLE, Source<TestSource>(&test_source)); - service->AddObserver( - &idle_test_source, NotificationType::ALL, Source<TestSource>(&test_source)); + service->AddObserver(&idle_test_source, + NotificationType::IDLE, + Source<TestSource>(&test_source)); + service->AddObserver(&idle_test_source, + NotificationType::ALL, + Source<TestSource>(&test_source)); service->Notify(NotificationType::IDLE, Source<TestSource>(&test_source), NotificationService::NoDetails()); EXPECT_EQ(2, idle_test_source.notification_count()); - service->RemoveObserver( - &idle_test_source, NotificationType::IDLE, Source<TestSource>(&test_source)); + service->RemoveObserver(&idle_test_source, + NotificationType::IDLE, + Source<TestSource>(&test_source)); service->Notify(NotificationType::IDLE, Source<TestSource>(&test_source), NotificationService::NoDetails()); EXPECT_EQ(3, idle_test_source.notification_count()); - service->RemoveObserver( - &idle_test_source, NotificationType::ALL, Source<TestSource>(&test_source)); + service->RemoveObserver(&idle_test_source, + NotificationType::ALL, + Source<TestSource>(&test_source)); service->Notify(NotificationType::IDLE, Source<TestSource>(&test_source), diff --git a/chrome/common/os_exchange_data_unittest.cc b/chrome/common/os_exchange_data_unittest.cc index f199c10..869ee92 100644 --- a/chrome/common/os_exchange_data_unittest.cc +++ b/chrome/common/os_exchange_data_unittest.cc @@ -259,7 +259,8 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) { // File contents access via COM CComPtr<IDataObject> com_data(data); { - CLIPFORMAT cfstr_file_contents = RegisterClipboardFormat(CFSTR_FILECONTENTS); + CLIPFORMAT cfstr_file_contents = + RegisterClipboardFormat(CFSTR_FILECONTENTS); FORMATETC format_etc = { cfstr_file_contents, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; EXPECT_EQ(S_OK, com_data->QueryGetData(&format_etc)); @@ -268,7 +269,9 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) { EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium)); ScopedHGlobal<char> glob(medium.hGlobal); std::string output(glob.get(), glob.Size()); - std::string file_contents = "[InternetShortcut]\r\nURL=" + url_spec + "\r\n"; + std::string file_contents = "[InternetShortcut]\r\nURL="; + file_contents += url_spec; + file_contents += "\r\n"; EXPECT_EQ(file_contents, output); ReleaseStgMedium(&medium); } diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h index f5377d2..3ab6965 100644 --- a/chrome/common/pref_service.h +++ b/chrome/common/pref_service.h @@ -56,8 +56,8 @@ class PrefService : public NonThreadSafe { // browser.window_placement). const std::wstring name() const { return name_; } - // Returns the value of the Preference. If there is no user specified value, - // it returns the default value. + // Returns the value of the Preference. If there is no user specified + // value, it returns the default value. const Value* GetValue() const; // Returns true if the current value matches the default value. @@ -76,7 +76,8 @@ class PrefService : public NonThreadSafe { DISALLOW_COPY_AND_ASSIGN(Preference); }; - // |pref_filename| is the path to the prefs file we will try to load or save to. + // |pref_filename| is the path to the prefs file we will try to load or save + // to. explicit PrefService(const FilePath& pref_filename); ~PrefService(); @@ -128,8 +129,8 @@ class PrefService : public NonThreadSafe { bool IsPrefRegistered(const wchar_t* path); // If the path is valid and the value at the end of the path matches the type - // specified, it will return the specified value. Otherwise, the default value - // (set when the pref was registered) will be returned. + // specified, it will return the specified value. Otherwise, the default + // value (set when the pref was registered) will be returned. bool GetBoolean(const wchar_t* path) const; int GetInteger(const wchar_t* path) const; double GetReal(const wchar_t* path) const; diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 582bf3a..462d853 100755 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -1337,7 +1337,9 @@ struct ParamTraits<ResourceResponseHead> { } static bool Read(const Message* m, void** iter, param_type* r) { return - ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m, iter, r) && + ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m, + iter, + r) && ReadParam(m, iter, &r->status) && ReadParam(m, iter, &r->filter_policy); } diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc index 29bb679..cfaf10d 100644 --- a/chrome/common/resource_bundle.cc +++ b/chrome/common/resource_bundle.cc @@ -92,7 +92,7 @@ SkBitmap* ResourceBundle::LoadBitmap(DataHandle data_handle, int resource_id) { // Decode the PNG. int image_width; int image_height; - if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(), + if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(), PNGDecoder::FORMAT_BGRA, &png_data, &image_width, &image_height)) { NOTREACHED() << "Unable to decode image resource " << resource_id; diff --git a/chrome/common/resource_bundle_win.cc b/chrome/common/resource_bundle_win.cc index 377ba4e..27b0b36 100644 --- a/chrome/common/resource_bundle_win.cc +++ b/chrome/common/resource_bundle_win.cc @@ -58,7 +58,8 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { // The dll should only have resources, not executable code. locale_resources_data_ = LoadLibraryEx(locale_path.value().c_str(), NULL, GetDataDllLoadFlags()); - DCHECK(locale_resources_data_ != NULL) << "unable to load generated resources"; + DCHECK(locale_resources_data_ != NULL) << + "unable to load generated resources"; } FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc index e4c8792..518ee7c 100644 --- a/chrome/common/resource_dispatcher_unittest.cc +++ b/chrome/common/resource_dispatcher_unittest.cc @@ -114,7 +114,8 @@ class ResourceDispatcherTest : public testing::Test, base::SharedMemoryHandle dup_handle; EXPECT_TRUE(shared_mem.GiveToProcess( base::Process::Current().handle(), &dup_handle)); - dispatcher_->OnReceivedData(request_id, dup_handle, test_page_contents_len); + dispatcher_->OnReceivedData(request_id, dup_handle, + test_page_contents_len); message_queue_.erase(message_queue_.begin()); diff --git a/chrome/common/stl_util-inl.h b/chrome/common/stl_util-inl.h index 7c4983a..f13de2b 100644 --- a/chrome/common/stl_util-inl.h +++ b/chrome/common/stl_util-inl.h @@ -196,8 +196,12 @@ inline bool HashSetEquality(const HashSet& set_a, const HashSet& set_b) { if (set_a.size() != set_b.size()) return false; - for (typename HashSet::const_iterator i = set_a.begin(); i != set_a.end(); ++i) - if (set_b.find(*i) == set_b.end()) return false; + for (typename HashSet::const_iterator i = set_a.begin(); + i != set_a.end(); + ++i) { + if (set_b.find(*i) == set_b.end()) + return false; + } return true; } diff --git a/chrome/common/time_format_unittest.cc b/chrome/common/time_format_unittest.cc index 07119d1..bc99ee4 100644 --- a/chrome/common/time_format_unittest.cc +++ b/chrome/common/time_format_unittest.cc @@ -57,7 +57,8 @@ TEST(TimeFormat, RemainingTime) { TestRemainingTime(twohundred_millisecs, L"0 secs", L"0 secs left"); TestRemainingTime(one_sec - twohundred_millisecs, L"0 secs", L"0 secs left"); TestRemainingTime(one_sec + twohundred_millisecs, L"1 sec", L"1 sec left"); - TestRemainingTime(five_secs + twohundred_millisecs, L"5 secs", L"5 secs left"); + TestRemainingTime(five_secs + twohundred_millisecs, L"5 secs", + L"5 secs left"); TestRemainingTime(one_min + five_secs, L"1 min", L"1 min left"); TestRemainingTime(three_mins + twohundred_millisecs, L"3 mins", L"3 mins left"); diff --git a/chrome/common/visitedlink_common.cc b/chrome/common/visitedlink_common.cc index 6bda05d..c694859 100644 --- a/chrome/common/visitedlink_common.cc +++ b/chrome/common/visitedlink_common.cc @@ -62,8 +62,8 @@ bool VisitedLinkCommon::IsVisited(Fingerprint fingerprint) const { // Uses the top 64 bits of the MD5 sum of the canonical URL as the fingerprint, // this is as random as any other subset of the MD5SUM. // -// FIXME: this uses the MD5SUM of the 16-bit character version. For systems where -// wchar_t is not 16 bits (Linux uses 32 bits, I think), this will not be +// FIXME: this uses the MD5SUM of the 16-bit character version. For systems +// where wchar_t is not 16 bits (Linux uses 32 bits, I think), this will not be // compatable. We should define explicitly what should happen here across // platforms, and convert if necessary (probably to UTF-16). diff --git a/chrome/common/visitedlink_common.h b/chrome/common/visitedlink_common.h index 06a4f5c..35cadb7 100644 --- a/chrome/common/visitedlink_common.h +++ b/chrome/common/visitedlink_common.h @@ -91,8 +91,8 @@ class VisitedLinkCommon { }; // Returns the fingerprint at the given index into the URL table. This - // function should be called instead of accessing the table directly to contain - // endian issues. + // function should be called instead of accessing the table directly to + // contain endian issues. Fingerprint FingerprintAt(int32 table_offset) const { DCHECK(hash_table_); if (!hash_table_) @@ -113,7 +113,8 @@ class VisitedLinkCommon { static Hash HashFingerprint(Fingerprint fingerprint, int32 table_length) { return static_cast<Hash>(fingerprint % table_length); } - Hash HashFingerprint(Fingerprint fingerprint) const { // uses the current hashtable + // Uses the current hashtable. + Hash HashFingerprint(Fingerprint fingerprint) const { return HashFingerprint(fingerprint, table_length_); } diff --git a/chrome/common/win_safe_util.cc b/chrome/common/win_safe_util.cc index 70782ee..f4c45c4 100644 --- a/chrome/common/win_safe_util.cc +++ b/chrome/common/win_safe_util.cc @@ -16,73 +16,6 @@ namespace win_util { -// This is the COM IAttachmentExecute interface definition. -// In the current Chrome headers it is not present because the _WIN32_IE macro -// is not set at the XPSP2 or IE60 level. We have placed guards to avoid double -// declaration in case we change the _WIN32_IE macro. -#ifndef __IAttachmentExecute_INTERFACE_DEFINED__ -#define __IAttachmentExecute_INTERFACE_DEFINED__ - -typedef -enum tagATTACHMENT_PROMPT -{ ATTACHMENT_PROMPT_NONE = 0, -ATTACHMENT_PROMPT_SAVE = 0x1, -ATTACHMENT_PROMPT_EXEC = 0x2, -ATTACHMENT_PROMPT_EXEC_OR_SAVE = 0x3 -} ATTACHMENT_PROMPT; - -typedef -enum tagATTACHMENT_ACTION -{ ATTACHMENT_ACTION_CANCEL = 0, -ATTACHMENT_ACTION_SAVE = 0x1, -ATTACHMENT_ACTION_EXEC = 0x2 -} ATTACHMENT_ACTION; - -MIDL_INTERFACE("73db1241-1e85-4581-8e4f-a81e1d0f8c57") -IAttachmentExecute : public IUnknown -{ -public: - virtual HRESULT STDMETHODCALLTYPE SetClientTitle( - /* [string][in] */ LPCWSTR pszTitle) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetClientGuid( - /* [in] */ REFGUID guid) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetLocalPath( - /* [string][in] */ LPCWSTR pszLocalPath) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFileName( - /* [string][in] */ LPCWSTR pszFileName) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSource( - /* [string][in] */ LPCWSTR pszSource) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetReferrer( - /* [string][in] */ LPCWSTR pszReferrer) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckPolicy( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Prompt( - /* [in] */ HWND hwnd, - /* [in] */ ATTACHMENT_PROMPT prompt, - /* [out] */ ATTACHMENT_ACTION *paction) = 0; - - virtual HRESULT STDMETHODCALLTYPE Save( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Execute( - /* [in] */ HWND hwnd, - /* [string][in] */ LPCWSTR pszVerb, - HANDLE *phProcess) = 0; - - virtual HRESULT STDMETHODCALLTYPE SaveWithUI( - HWND hwnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE ClearClientState( void) = 0; - -}; - -#endif // __IAttachmentExecute_INTERFACE_DEFINED__ - // This function implementation is based on the attachment execution // services functionally deployed with IE6 or Service pack 2. This // functionality is exposed in the IAttachmentExecute COM interface. diff --git a/chrome/common/win_util.cc b/chrome/common/win_util.cc index 7437031..07a1b08 100644 --- a/chrome/common/win_util.cc +++ b/chrome/common/win_util.cc @@ -116,7 +116,8 @@ std::wstring FormatSystemDate(const SYSTEMTIME& date, return output; } -bool ConvertToLongPath(const std::wstring& short_path, std::wstring* long_path) { +bool ConvertToLongPath(const std::wstring& short_path, + std::wstring* long_path) { wchar_t long_path_buf[MAX_PATH]; DWORD return_value = GetLongPathName(short_path.c_str(), long_path_buf, MAX_PATH); @@ -172,7 +173,8 @@ void ShowItemInFolder(const std::wstring& full_path) { PCUITEMID_CHILD_ARRAY pidls, DWORD flags); - static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr = NULL; + static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr = + NULL; static bool initialize_open_folder_proc = true; if (initialize_open_folder_proc) { initialize_open_folder_proc = false; diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index f0a27b4..75bae0c 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -16,12 +16,17 @@ namespace { -const wchar_t kChromeRegClientsKey[] = L"Software\\Google\\Update\\Clients\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; -const wchar_t kChromeRegClientStateKey[] = L"Software\\Google\\Update\\ClientState\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientsKey[] = + L"Software\\Google\\Update\\Clients\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientStateKey[] = + L"Software\\Google\\Update\\ClientState\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kChromeRegLaunchCmd[] = L"InstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegLastLaunchCmd[] = L"LastInstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegVersion[] = L"pv"; -const wchar_t kNoChromeOfferUntil[] = L"SOFTWARE\\Google\\No Chrome Offer Until"; +const wchar_t kNoChromeOfferUntil[] = + L"SOFTWARE\\Google\\No Chrome Offer Until"; // Return the company name specified in the file version info resource. bool GetCompanyName(const wchar_t* filename, wchar_t* buffer, DWORD out_len) { @@ -95,7 +100,7 @@ bool CanReOfferChrome(BOOL set_flag) { SYSTEMTIME now; GetLocalTime(&now); DWORD today = now.wYear * 10000 + now.wMonth * 100 + now.wDay; - + // Cannot re-offer, if the timer already exists and is not expired yet. DWORD value_type = REG_DWORD; DWORD value_data = 0; @@ -120,7 +125,7 @@ bool CanReOfferChrome(BOOL set_flag) { timer.wYear = timer.wYear + 1; } DWORD value = timer.wYear * 10000 + timer.wMonth * 100 + timer.wDay; - ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, + ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, sizeof(DWORD)); } } @@ -278,7 +283,8 @@ bool GetUserIdForProcess(size_t pid, wchar_t** user_sid) { } // namespace #pragma comment(linker, "/EXPORT:GoogleChromeCompatibilityCheck=_GoogleChromeCompatibilityCheck@8,PRIVATE") -DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, DWORD *reasons) { +DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, + DWORD *reasons) { DWORD local_reasons = 0; bool is_vista_or_later = false; diff --git a/chrome/installer/mini_installer/mini_installer.h b/chrome/installer/mini_installer/mini_installer.h index 3f0a6d4..506e218 100644 --- a/chrome/installer/mini_installer/mini_installer.h +++ b/chrome/installer/mini_installer/mini_installer.h @@ -28,10 +28,12 @@ const wchar_t kUninstallRegistryValueName[] = L"UninstallString"; const wchar_t kCleanupRegistryValueName[] = L"ChromeInstallerCleanup"; // Paths for the above two registry keys #if defined(GOOGLE_CHROME_BUILD) -const wchar_t kUninstallRegistryKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; +const wchar_t kUninstallRegistryKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; const wchar_t kCleanupRegistryKey[] = L"Software\\Google"; #else -const wchar_t kUninstallRegistryKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chromium"; +const wchar_t kUninstallRegistryKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chromium"; const wchar_t kCleanupRegistryKey[] = L"Software\\Chromium"; #endif diff --git a/chrome/installer/setup/setup_constants.cc b/chrome/installer/setup/setup_constants.cc index 300c9d5..d9bd2f2 100644 --- a/chrome/installer/setup/setup_constants.cc +++ b/chrome/installer/setup/setup_constants.cc @@ -17,6 +17,7 @@ const wchar_t kChromeCompressedPatchArchivePrefix[] = L"patch"; const wchar_t kInstallSourceDir[] = L"source"; const wchar_t kInstallSourceChromeDir[] = L"Chrome-bin"; -const wchar_t kMediaPlayerRegPath[] = L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList"; +const wchar_t kMediaPlayerRegPath[] = + L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList"; } // namespace installer diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index d70bcd2..b3ad065 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -232,7 +232,8 @@ std::wstring GoogleChromeDistribution::GetUninstallLinkName() { } std::wstring GoogleChromeDistribution::GetUninstallRegPath() { - return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; + return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + L"Google Chrome"; } std::wstring GoogleChromeDistribution::GetVersionKey() { diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 33a32f9..7984de6 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -45,7 +45,8 @@ class RegistryEntry { public: // This method returns a list of all the registry entries that are needed // to register Chrome. - static std::list<RegistryEntry*> GetAllEntries(const std::wstring& chrome_exe) { + static std::list<RegistryEntry*> GetAllEntries( + const std::wstring& chrome_exe) { std::list<RegistryEntry*> entries; std::wstring icon_path(chrome_exe); ShellUtil::GetChromeIcon(icon_path); @@ -96,7 +97,8 @@ class RegistryEntry { L"Software\\Clients\\StartMenuInternet\\chrome.exe", dist->GetApplicationName())); entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\shell\\open\\command", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\shell\\open\\" + L"command", quoted_exe_path)); entries.push_front(new RegistryEntry( L"Software\\Clients\\StartMenuInternet\\chrome.exe\\DefaultIcon", @@ -132,16 +134,19 @@ class RegistryEntry { L"ApplicationName", dist->GetApplicationName())); entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\StartMenu", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"StartMenu", L"StartMenuInternet", L"chrome.exe")); for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) { entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\FileAssociations", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"FileAssociations", ShellUtil::kFileAssociations[i], ShellUtil::kChromeHTMLProgId)); } for (int i = 0; ShellUtil::kProtocolAssociations[i] != NULL; i++) { entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\URLAssociations", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"URLAssociations", ShellUtil::kProtocolAssociations[i], ShellUtil::kChromeHTMLProgId)); } return entries; @@ -383,7 +388,8 @@ const wchar_t* ShellUtil::kRegClasses = L"Software\\Classes"; const wchar_t* ShellUtil::kRegRegisteredApplications = L"Software\\RegisteredApplications"; const wchar_t* ShellUtil::kRegVistaUrlPrefs = - L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice"; + L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\" + L"http\\UserChoice"; const wchar_t* ShellUtil::kAppPathsRegistryKey = L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"; const wchar_t* ShellUtil::kAppPathsRegistryPathName = L"Path"; diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 0af1f32..019b1b2 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -117,7 +117,8 @@ bool NPObjectProxy::NPHasMethod(NPObject *obj, NPIdentifier_Param name_param; CreateNPIdentifierParam(name, &name_param); - proxy->Send(new NPObjectMsg_HasMethod(proxy->route_id(), name_param, &result)); + proxy->Send(new NPObjectMsg_HasMethod(proxy->route_id(), name_param, + &result)); return result; } @@ -151,7 +152,8 @@ bool NPObjectProxy::NPInvokePrivate(NPP npp, bool result = false; NPIdentifier_Param name_param; if (is_default) { - // The data won't actually get used, but set it so we don't send random data. + // The data won't actually get used, but set it so we don't send random + // data. name_param.identifier = NULL; } else { CreateNPIdentifierParam(name, &name_param); @@ -397,4 +399,3 @@ void NPObjectProxy::NPNSetException(NPObject *obj, // Send may delete proxy. proxy = NULL; } - diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc index e0d813f..8e30495 100644 --- a/chrome/plugin/npobject_util.cc +++ b/chrome/plugin/npobject_util.cc @@ -41,7 +41,8 @@ static bool NPN_InvokePatch(NPP npp, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) { - return NPObjectProxy::NPInvokePrivate(npp, npobj, false, methodName, args, argCount, result); + return NPObjectProxy::NPInvokePrivate(npp, npobj, false, methodName, args, + argCount, result); } static bool NPN_InvokeDefaultPatch(NPP npp, @@ -49,7 +50,8 @@ static bool NPN_InvokeDefaultPatch(NPP npp, const NPVariant *args, uint32_t argCount, NPVariant *result) { - return NPObjectProxy::NPInvokePrivate(npp, npobj, true, 0, args, argCount, result); + return NPObjectProxy::NPInvokePrivate(npp, npobj, true, 0, args, argCount, + result); } static bool NPN_HasPropertyPatch(NPP npp, @@ -238,19 +240,23 @@ void CreateNPVariant(const NPVariant_Param& param, break; case NPVARIANT_PARAM_OBJECT_ROUTING_ID: result->type = NPVariantType_Object; - result->value.objectValue = NPObjectProxy::Create(channel, - param.npobject_routing_id, - param.npobject_pointer, - modal_dialog_event); + result->value.objectValue = + NPObjectProxy::Create(channel, + param.npobject_routing_id, + param.npobject_pointer, + modal_dialog_event); break; case NPVARIANT_PARAM_OBJECT_POINTER: result->type = NPVariantType_Object; - result->value.objectValue = static_cast<NPObject*>(param.npobject_pointer); + result->value.objectValue = + static_cast<NPObject*>(param.npobject_pointer); NPN_RetainObject(result->value.objectValue); break; default: NOTREACHED(); } } -#endif -#endif + +#endif // defined(OS_WIN) + +#endif // defined(OS_WIN) diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc index d9da495..4774d8c 100644 --- a/chrome/plugin/plugin_channel.cc +++ b/chrome/plugin/plugin_channel.cc @@ -66,7 +66,8 @@ void PluginChannel::OnMessageReceived(const IPC::Message& msg) { void PluginChannel::OnControlMessageReceived(const IPC::Message& msg) { IPC_BEGIN_MESSAGE_MAP(PluginChannel, msg) IPC_MESSAGE_HANDLER(PluginMsg_CreateInstance, OnCreateInstance) - IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_DestroyInstance, OnDestroyInstance) + IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_DestroyInstance, + OnDestroyInstance) IPC_MESSAGE_HANDLER(PluginMsg_GenerateRouteID, OnGenerateRouteID) IPC_MESSAGE_UNHANDLED_ERROR() IPC_END_MESSAGE_MAP() diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc index 2785328..61b56d5 100644 --- a/chrome/plugin/plugin_channel_base.cc +++ b/chrome/plugin/plugin_channel_base.cc @@ -181,7 +181,8 @@ void PluginChannelBase::RemoveRoute(int route_id) { } void PluginChannelBase::OnControlMessageReceived(const IPC::Message& msg) { - NOTREACHED() << "should override in subclass if you care about control messages"; + NOTREACHED() << + "should override in subclass if you care about control messages"; } void PluginChannelBase::OnChannelError() { diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h index 38b989e..e701490 100644 --- a/chrome/plugin/plugin_thread.h +++ b/chrome/plugin/plugin_thread.h @@ -24,7 +24,9 @@ class PluginThread : public ChildThread { static PluginThread* current(); // Returns the one true dispatcher. - ResourceDispatcher* resource_dispatcher() { return resource_dispatcher_.get(); } + ResourceDispatcher* resource_dispatcher() { + return resource_dispatcher_.get(); + } private: virtual void OnControlMessageReceived(const IPC::Message& msg); diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index 023d807..3026333 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -95,7 +95,8 @@ void WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) { OnDidFinishManualLoading) IPC_MESSAGE_HANDLER(PluginMsg_DidManualLoadFail, OnDidManualLoadFail) IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin) - IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply, OnHandleURLRequestReply) + IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply, + OnHandleURLRequestReply) IPC_MESSAGE_HANDLER(PluginMsg_URLRequestRouted, OnURLRequestRouted) IPC_MESSAGE_UNHANDLED_ERROR() IPC_END_MESSAGE_MAP() diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index d029fa1..c8e48d5 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -50,7 +50,8 @@ WebPluginProxy::WebPluginProxy( SYNCHRONIZE, FALSE, 0); - DCHECK(result) << "Couldn't duplicate the modal dialog handle for the plugin."; + DCHECK(result) << + "Couldn't duplicate the modal dialog handle for the plugin."; modal_dialog_event_.reset(new base::WaitableEvent(event)); } diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index b10042b..b93adf59 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -19,7 +19,8 @@ #include "base/histogram.h" #include "base/path_service.h" #include "base/sys_info.h" -#include "chrome/browser/net/dns_global.h" // TODO(jar): DNS calls should be renderer specific, not including browser. +// TODO(jar): DNS calls should be renderer specific, not including browser. +#include "chrome/browser/net/dns_global.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/ipc_channel.h" diff --git a/chrome/renderer/render_process_unittest.cc b/chrome/renderer/render_process_unittest.cc index c787e44..dc360c3 100644 --- a/chrome/renderer/render_process_unittest.cc +++ b/chrome/renderer/render_process_unittest.cc @@ -44,7 +44,8 @@ TEST_F(RenderProcessTest, TestTransportDIBAllocation) { #if !defined(OS_MACOSX) const gfx::Rect rect(0, 0, 100, 100); TransportDIB* dib; - skia::PlatformCanvas* canvas = RenderProcess::current()->GetDrawingCanvas(&dib, rect); + skia::PlatformCanvas* canvas = + RenderProcess::current()->GetDrawingCanvas(&dib, rect); ASSERT_TRUE(dib); ASSERT_TRUE(canvas); RenderProcess::current()->ReleaseTransportDIB(dib); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 3f11ec2..db11b68 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -402,8 +402,9 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { OnUpdateBackForwardListCount) IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage, OnGetAllSavableResourceLinksForCurrentPage) - IPC_MESSAGE_HANDLER(ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks, - OnGetSerializedHtmlDataForCurrentPageWithLocalLinks) + IPC_MESSAGE_HANDLER( + ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks, + OnGetSerializedHtmlDataForCurrentPageWithLocalLinks) IPC_MESSAGE_HANDLER(ViewMsg_GetApplicationInfo, OnGetApplicationInfo) IPC_MESSAGE_HANDLER(ViewMsg_GetAccessibilityInfo, OnGetAccessibilityInfo) IPC_MESSAGE_HANDLER(ViewMsg_ClearAccessibilityInfo, diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 911e86e..a7ad380 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -334,7 +334,8 @@ void RenderWidget::DoDeferredPaint() { // Compute a buffer for painting and cache it. skia::PlatformCanvas* canvas = - RenderProcess::current()->GetDrawingCanvas(¤t_paint_buf_, damaged_rect); + RenderProcess::current()->GetDrawingCanvas(¤t_paint_buf_, + damaged_rect); if (!canvas) { NOTREACHED(); return; @@ -411,7 +412,8 @@ void RenderWidget::DoDeferredScroll() { damaged_rect = scroll_rect_.Intersect(damaged_rect); skia::PlatformCanvas* canvas = - RenderProcess::current()->GetDrawingCanvas(¤t_scroll_buf_, damaged_rect); + RenderProcess::current()->GetDrawingCanvas(¤t_scroll_buf_, + damaged_rect); if (!canvas) { NOTREACHED(); return; diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index d87d521..9fcf67f 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -836,7 +836,8 @@ bool AutomatedUITest::DragActiveTab(bool drag_right, bool drag_out) { WindowProxy* AutomatedUITest::GetAndActivateWindowForBrowser( BrowserProxy* browser) { bool did_timeout; - if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(), &did_timeout)) { + if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(), + &did_timeout)) { AddWarningAttribute("failed_to_bring_window_to_front"); return NULL; } diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index aec886b..8f79680 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -431,7 +431,8 @@ BrowserProxy* AutomationProxy::GetLastActiveBrowserWindow() { if (!SendWithTimeout(new AutomationMsg_LastActiveBrowserWindow( 0, &handle), command_execution_timeout_ms(), NULL)) { - DLOG(ERROR) << "GetLastActiveBrowserWindow did not complete in a timely fashion"; + DLOG(ERROR) << + "GetLastActiveBrowserWindow did not complete in a timely fashion"; return NULL; } diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 4033d65..07656e8 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -71,7 +71,8 @@ int TabProxy::FindInPage(const std::wstring& search_string, return matches; } -AutomationMsg_NavigationResponseValues TabProxy::NavigateToURL(const GURL& url) { +AutomationMsg_NavigationResponseValues TabProxy::NavigateToURL( + const GURL& url) { return NavigateToURLWithTimeout(url, base::kNoTimeout, NULL); } diff --git a/chrome/test/debugger/debugger_unittests.py b/chrome/test/debugger/debugger_unittests.py index 19db317..3aa2ab5 100755 --- a/chrome/test/debugger/debugger_unittests.py +++ b/chrome/test/debugger/debugger_unittests.py @@ -27,11 +27,13 @@ def RunTests(build_dir=None): v8_shell_sample = os.path.join(chrome_dir, "Debug", "v8_shell_sample.exe") # look for Debug version first if not os.path.isfile(v8_shell_sample): - v8_shell_sample = os.path.join(chrome_dir, "Release", "v8_shell_sample.exe") + v8_shell_sample = os.path.join(chrome_dir, "Release", + "v8_shell_sample.exe") cmd = [v8_shell_sample, "--allow-natives-syntax", "--expose-debug-as", "debugContext", - os.path.join(chrome_dir, "browser", "debugger", "resources", "debugger_shell.js"), + os.path.join(chrome_dir, "browser", "debugger", "resources", + "debugger_shell.js"), # TODO Change the location of mjsunit.js from the copy in this # directory to the copy in V8 when switching to use V8 from # code.google.com. diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc index a1d8a09..f80c30f 100644 --- a/chrome/test/selenium/selenium_test.cc +++ b/chrome/test/selenium/selenium_test.cc @@ -85,7 +85,8 @@ class SeleniumTest : public UITest { *total = L"100"; const wchar_t* kBogusFailures[] = { L"5.selectFrame,6.click,24.selectAndWait,24.verifyTitle", - L"5.selectFrame,6.click,13.verifyLocation,13.verifyLocation,13.click,24.selectAndWait,24.verifyTitle", + L"5.selectFrame,6.click,13.verifyLocation,13.verifyLocation,13.click," + L"24.selectAndWait,24.verifyTitle", L"5.selectFrame,6.click,24.selectAndWait" }; *failed = kBogusFailures[base::RandInt(0, 2)]; diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h index d3a337b..922fa82 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -122,7 +122,9 @@ class TestingBrowserProcess : public BrowserProcess { virtual MemoryModel memory_model() { return HIGH_MEMORY_MODEL; } - virtual base::WaitableEvent* shutdown_event() { return shutdown_event_.get(); } + virtual base::WaitableEvent* shutdown_event() { + return shutdown_event_.get(); + } private: NotificationService notification_service_; diff --git a/chrome/test/ui/layout_plugin_uitest.cpp b/chrome/test/ui/layout_plugin_uitest.cpp index 5743580..fa46e2a 100644 --- a/chrome/test/ui/layout_plugin_uitest.cpp +++ b/chrome/test/ui/layout_plugin_uitest.cpp @@ -47,9 +47,12 @@ class LayoutPluginTester : public UITest { TEST_F(LayoutPluginTester, UnloadNoCrash) { // We need to copy our test-plugin into the plugins directory so that // the browser can load it. - std::wstring plugins_directory = browser_directory_ + L"\\plugins"; - std::wstring plugin_src = browser_directory_ + L"\\npapi_layout_test_plugin.dll"; - std::wstring plugin_dest = plugins_directory + L"\\npapi_layout_test_plugin.dll"; + std::wstring plugins_directory = browser_directory_; + plugins_directory += L"\\plugins"; + std::wstring plugin_src = browser_directory_; + plugin_src += L"\\npapi_layout_test_plugin.dll"; + std::wstring plugin_dest = plugins_directory; + plugin_dest += L"\\npapi_layout_test_plugin.dll"; CreateDirectory(plugins_directory.c_str(), NULL); CopyFile(plugin_src.c_str(), plugin_dest.c_str(), true /* overwrite */); diff --git a/chrome/test/ui/omnibox_uitest.cc b/chrome/test/ui/omnibox_uitest.cc index f77a301..bdee1bd 100644 --- a/chrome/test/ui/omnibox_uitest.cc +++ b/chrome/test/ui/omnibox_uitest.cc @@ -57,8 +57,8 @@ class OmniboxTest : public UITest { bool OmniboxTest::IsMatch(const std::wstring& input_text, const std::wstring& suggestion) { - // This prefix list comes from the list used in history_url_provider.cc withiff - // the exception of "ftp." and "www.". + // This prefix list comes from the list used in history_url_provider.cc + // withiff the exception of "ftp." and "www.". std::wstring prefixes[] = {L"", L"ftp://", L"http://", L"https://", L"ftp.", L"www.", L"ftp://www.", L"ftp://ftp.", L"http://www.", L"https://www."}; diff --git a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py index 7e3d3f9..df9bc22 100755 --- a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py +++ b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py @@ -61,7 +61,8 @@ Options: Outputs a part of the full coverage, starting at command number |command_to_start_at| and ending at command number |command_to_start_at| + |commands_per_file|. Command numbering starts at 0, and the maximum - command number is number_of_actions_we_choose_from ^ actions_per_command - 1. + command number is number_of_actions_we_choose_from ^ actions_per_command - + 1. If |command_to_start_at| + |commands_per_file| is greater than the maximum command number, then only the commands up to the maximum command number are printed. @@ -264,8 +265,8 @@ class AutomatedTestInputGenerator: return doc, root_element def __WriteToOutputFile(self, file_name, output): - """Writes |output| to file with name |filename|. Overwriting any pre-existing - file. + """Writes |output| to file with name |filename|. Overwriting any + pre-existing file. Args: file_name: Name of the file to create. @@ -364,7 +365,8 @@ class AutomatedTestInputGenerator: is_complete = False file_counter = 0 - # Split the file name so we can include the file number before the extension. + # Split the file name so we can include the file number before the + # extension. base_file_name, extension = os.path.splitext(file_name) command_num = 0 @@ -399,7 +401,8 @@ def ParseCommandLine(): parser = optparse.OptionParser() parser.set_defaults(full_coverage=False) parser.add_option("-i", "--action-list-file", dest="input_file_name", - type="string", action="store", default="possible_actions.txt", + type="string", action="store", + default="possible_actions.txt", help="input file with a test of newline separated actions" "which are possible. Default is 'possible_actions.txt'") parser.add_option("-o", "--output", dest="output_file_name", type="string", |