summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_init.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:54:50 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:54:50 +0000
commit4ab4b0f66a346a4e48601d51693170d9adc85d96 (patch)
treeb74eb578456bf14a343b658586ec9898471872a4 /chrome/browser/browser_init.cc
parent43f55738f0922bc479ee00b5d3d3c264e080f512 (diff)
downloadchromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.zip
chromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.tar.gz
chromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.tar.bz2
Porting unit tests in chrome/
- Make following unit tests compile and pass on Linux: browser/ command_updater_unittest.cc metrics/metrics_log_unittest.cc search_engines/template_url_parser_unittest.cc search_engines/template_url_prepopulate_data_unittest.cc - Add renderer/renderer_main_unittest.cc to list of compiled files (currently stubbed out on Linux) - Remove DebuggerWrapper stubs and make more files from browser/debugger build on Linux. - Sync XCode project file. - Misc cleanups needed for GCC. Review URL: http://codereview.chromium.org/21181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
-rw-r--r--chrome/browser/browser_init.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 721ebf2..74c65d6 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -12,6 +12,7 @@
#include "base/string_util.h"
#include "base/sys_info.h"
#include "chrome/app/result_codes.h"
+#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extensions_service.h"
@@ -424,7 +425,7 @@ bool BrowserInit::ProcessCommandLine(
if (StringToInt(popup_count_string, &count)) {
const int popup_count = std::max(0, count);
AutocompleteResult::set_max_matches(popup_count);
- AutocompleteProvider::set_max_matches(popup_count / 2);
+ AutocompleteProvider::set_max_matches(popup_count / 2);
}
}
@@ -440,7 +441,7 @@ bool BrowserInit::ProcessCommandLine(
SessionRestore::num_tabs_to_load_ = static_cast<size_t>(tab_count);
}
}
-
+
#if defined(OS_WIN)
// Look for the testing channel ID ONLY during process startup
if (command_line.HasSwitch(switches::kTestingChannelID)) {
@@ -505,7 +506,7 @@ bool BrowserInit::ProcessCommandLine(
}
return true;
}
-
+
bool BrowserInit::LaunchBrowser(const CommandLine& command_line,
Profile* profile, const std::wstring& cur_dir,
bool process_startup, int* return_code) {
@@ -538,7 +539,7 @@ bool BrowserInit::LaunchBrowserImpl(const CommandLine& command_line,
bool process_startup,
int* return_code) {
DCHECK(profile);
-
+
// Continue with the off-the-record profile from here on if --incognito
if (command_line.HasSwitch(switches::kIncognito))
profile = profile->GetOffTheRecordProfile();