Fixes almost all of the rest of lint errors in the chrome/ directory (minus the really hard ones which will need actual review instead of rubber-stamping.)

Review URL: http://codereview.chromium.org/386026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31932 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 24 insertions, 23 deletions

diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 916e765..88b4428 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -190,7 +190,7 @@ class ChromeURLRequestContext : public URLRequestContext {
   // Copies the dependencies from |other| into |this|. If you use this
   // constructor, then you should hold a reference to |other|, as we
   // depend on |other| being alive.
-  ChromeURLRequestContext(ChromeURLRequestContext* other);
+  explicit ChromeURLRequestContext(ChromeURLRequestContext* other);
   virtual ~ChromeURLRequestContext();
 
  public:
@@ -286,7 +286,7 @@ class ChromeURLRequestContextFactory {
  public:
   // Extract properties of interested from |profile|, for setting later into
   // a ChromeURLRequestContext using ApplyProfileParametersToContext().
-  ChromeURLRequestContextFactory(Profile* profile);
+  explicit ChromeURLRequestContextFactory(Profile* profile);
 
   virtual ~ChromeURLRequestContextFactory();
 
diff --git a/chrome/browser/net/resolve_proxy_msg_helper.h b/chrome/browser/net/resolve_proxy_msg_helper.h
index 2bc03ec..22be9ed 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper.h
+++ b/chrome/browser/net/resolve_proxy_msg_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_
-#define CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_
+#ifndef CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
+#define CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
 
 #include <deque>
 #include <string>
@@ -101,4 +101,4 @@ class ResolveProxyMsgHelper {
   scoped_refptr<net::ProxyService> proxy_service_override_;
 };
 
-#endif  // CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_
+#endif  // CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h
index 5e3716c..e687f02 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.h
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.h
@@ -21,7 +21,7 @@ class FilePath;
 class SQLitePersistentCookieStore
     : public net::CookieMonster::PersistentCookieStore {
  public:
-  SQLitePersistentCookieStore(const FilePath& path);
+  explicit SQLitePersistentCookieStore(const FilePath& path);
   ~SQLitePersistentCookieStore();
 
   virtual bool Load(std::vector<net::CookieMonster::KeyedCanonicalCookie>*);
diff --git a/chrome/browser/net/test_url_fetcher_factory.h b/chrome/browser/net/test_url_fetcher_factory.h
index 3330ba2..12864a0 100644
--- a/chrome/browser/net/test_url_fetcher_factory.h
+++ b/chrome/browser/net/test_url_fetcher_factory.h
@@ -75,4 +75,4 @@ class TestURLFetcherFactory : public URLFetcher::Factory {
   DISALLOW_COPY_AND_ASSIGN(TestURLFetcherFactory);
 };
 
-#endif  // CHROME_TEST_TEST_URL_FETCHER_FACTORY_H_
+#endif  // CHROME_BROWSER_NET_TEST_URL_FETCHER_FACTORY_H_
diff --git a/chrome/browser/net/url_fetcher.h b/chrome/browser/net/url_fetcher.h
index f81fd69..6850a36 100644
--- a/chrome/browser/net/url_fetcher.h
+++ b/chrome/browser/net/url_fetcher.h
@@ -7,8 +7,8 @@
 // reading.  This is useful for callers who simply want to get the data from a
 // URL and don't care about all the nitty-gritty details.
 
-#ifndef CHROME_BROWSER_URL_FETCHER_H_
-#define CHROME_BROWSER_URL_FETCHER_H_
+#ifndef CHROME_BROWSER_NET_URL_FETCHER_H_
+#define CHROME_BROWSER_NET_URL_FETCHER_H_
 
 #include "base/leak_tracker.h"
 #include "base/message_loop.h"
@@ -163,4 +163,4 @@ class URLFetcher {
   DISALLOW_EVIL_CONSTRUCTORS(URLFetcher);
 };
 
-#endif  // CHROME_BROWSER_URL_FETCHER_H_
+#endif  // CHROME_BROWSER_NET_URL_FETCHER_H_
diff --git a/chrome/browser/net/url_fetcher_protect.h b/chrome/browser/net/url_fetcher_protect.h
index 5e069fa..25015ac 100644
--- a/chrome/browser/net/url_fetcher_protect.h
+++ b/chrome/browser/net/url_fetcher_protect.h
@@ -5,8 +5,8 @@
 // This file implements backoff in the suggest system so that we don't
 // DOS the Suggest servers when using URLFetcher.
 
-#ifndef CHROME_BROWSER_URL_FETCHER_PROTECT_H__
-#define CHROME_BROWSER_URL_FETCHER_PROTECT_H__
+#ifndef CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
+#define CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
 
 #include <map>
 #include <queue>
@@ -141,4 +141,4 @@ class URLFetcherProtectManager {
   DISALLOW_COPY_AND_ASSIGN(URLFetcherProtectManager);
 };
 
-#endif  // CHROME_BROWSER_URL_FETCHER_PROTECT_H__
+#endif  // CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
diff --git a/chrome/browser/net/url_fixer_upper.h b/chrome/browser/net/url_fixer_upper.h
index d3db746..9a4b35b 100644
--- a/chrome/browser/net/url_fixer_upper.h
+++ b/chrome/browser/net/url_fixer_upper.h
@@ -67,4 +67,4 @@ namespace URLFixerUpper {
   extern const char* home_directory_override;
 };
 
-#endif  // #ifndef CHROME_BROWSER_NET_URL_FIXER_UPPER_H_
+#endif  // CHROME_BROWSER_NET_URL_FIXER_UPPER_H_
diff --git a/chrome/browser/net/url_request_failed_dns_job.h b/chrome/browser/net/url_request_failed_dns_job.h
index f785c1a..2c2e3367 100644
--- a/chrome/browser/net/url_request_failed_dns_job.h
+++ b/chrome/browser/net/url_request_failed_dns_job.h
@@ -10,7 +10,7 @@
 
 class URLRequestFailedDnsJob : public URLRequestJob {
  public:
-  URLRequestFailedDnsJob(URLRequest* request)
+  explicit URLRequestFailedDnsJob(URLRequest* request)
       : URLRequestJob(request) { }
 
   virtual void Start();
diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
index abfcf67..34f949b 100644
--- a/chrome/browser/net/url_request_mock_http_job.h
+++ b/chrome/browser/net/url_request_mock_http_job.h
@@ -45,4 +45,4 @@ class URLRequestMockHTTPJob : public URLRequestFileJob {
   static FilePath base_path_;
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index 3f695fe..be1367f 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -11,7 +11,7 @@
 
 class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
  public:
-  URLRequestMockLinkDoctorJob(URLRequest* request);
+  explicit URLRequestMockLinkDoctorJob(URLRequest* request);
 
   static URLRequest::ProtocolFactory Factory;
 
@@ -22,4 +22,4 @@ class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
   ~URLRequestMockLinkDoctorJob() {}
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index da81339..796cc0e 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -6,8 +6,8 @@
 // related).
 // It is based on URLRequestMockHttpJob.
 
-#ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
-#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
+#ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
+#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
 
 #include "chrome/browser/net/url_request_mock_http_job.h"
 
@@ -67,4 +67,4 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestMockNetErrorJob);
 };
 
-#endif  // #define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index 7545f4e..347d55a 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -40,4 +40,4 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   static FilePath base_path_;
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index 02942af..a9a3ccc 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
@@ -91,8 +91,9 @@ void WebSocketExperimentTask::OnURLFetchComplete(
   if (next_state_ != STATE_URL_FETCH_COMPLETE) {
     DLOG(INFO) << "unexpected state=" << next_state_;
     result = net::ERR_UNEXPECTED;
-  } else if (response_code == 200 || response_code == 304)
+  } else if (response_code == 200 || response_code == 304) {
     result = net::OK;
+  }
   DoLoop(result);
 }