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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 7736001: Adding unit tests to RLZ code. Refactoring RLZ code to make it more testable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Removing all references to headless envvar Created 9 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 if (template_url_service) { 1878 if (template_url_service) {
1879 const TemplateURL* url_template = 1879 const TemplateURL* url_template =
1880 template_url_service->GetDefaultSearchProvider(); 1880 template_url_service->GetDefaultSearchProvider();
1881 if (url_template) { 1881 if (url_template) {
1882 const TemplateURLRef* urlref = url_template->url(); 1882 const TemplateURLRef* urlref = url_template->url();
1883 if (urlref) { 1883 if (urlref) {
1884 google_search_default = urlref->HasGoogleBaseURLs(); 1884 google_search_default = urlref->HasGoogleBaseURLs();
1885 } 1885 }
1886 } 1886 }
1887 } 1887 }
1888 // TODO(rogerta): For now, always passing false for google_homeapge_default
1889 // argument, so that functionality is disabled. A follow up CL will set it
1890 // correctly.
1888 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay, 1891 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay,
1889 google_search_default); 1892 google_search_default, false);
1890 #endif // GOOGLE_CHROME_BUILD 1893 #endif // GOOGLE_CHROME_BUILD
1891 #endif // OS_WIN 1894 #endif // OS_WIN
1892 1895
1893 // Configure modules that need access to resources. 1896 // Configure modules that need access to resources.
1894 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); 1897 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
1895 1898
1896 // In unittest mode, this will do nothing. In normal mode, this will create 1899 // In unittest mode, this will do nothing. In normal mode, this will create
1897 // the global GoogleURLTracker and IntranetRedirectDetector instances, which 1900 // the global GoogleURLTracker and IntranetRedirectDetector instances, which
1898 // will promptly go to sleep for five and seven seconds, respectively (to 1901 // will promptly go to sleep for five and seven seconds, respectively (to
1899 // avoid slowing startup), and wake up afterwards to see if they should do 1902 // avoid slowing startup), and wake up afterwards to see if they should do
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2187 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2185 (pre_read == "0" || pre_read == "1")) { 2188 (pre_read == "0" || pre_read == "1")) {
2186 std::string uma_name(name); 2189 std::string uma_name(name);
2187 uma_name += "_PreRead"; 2190 uma_name += "_PreRead";
2188 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2191 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2189 AddPreReadHistogramTime(uma_name.c_str(), time); 2192 AddPreReadHistogramTime(uma_name.c_str(), time);
2190 } 2193 }
2191 #endif 2194 #endif
2192 } 2195 }
2193 2196
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698