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

32 files changed, 65 insertions, 64 deletions

diff --git a/chrome/common/child_process_host.h b/chrome/common/child_process_host.h
index 6e1725e..a79eaf2 100644
--- a/chrome/common/child_process_host.h
+++ b/chrome/common/child_process_host.h
@@ -54,7 +54,7 @@ class ChildProcessHost : public ResourceDispatcherHost::Receiver,
   class Iterator {
    public:
     Iterator();
-    Iterator(ProcessType type);
+    explicit Iterator(ProcessType type);
     ChildProcessHost* operator->() { return *iterator_; }
     ChildProcessHost* operator*() { return *iterator_; }
     ChildProcessHost* operator++();
@@ -105,7 +105,7 @@ class ChildProcessHost : public ResourceDispatcherHost::Receiver,
   // calling the subclass' implementation.
   class ListenerHook : public IPC::Channel::Listener {
    public:
-    ListenerHook(ChildProcessHost* host);
+    explicit ListenerHook(ChildProcessHost* host);
     virtual void OnMessageReceived(const IPC::Message& msg);
     virtual void OnChannelConnected(int32 peer_pid);
     virtual void OnChannelError();
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 9b37e19..2082b08 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -21,7 +21,7 @@ class ChildThread : public IPC::Channel::Listener,
   // Creates the thread.
   ChildThread();
   // Used for single-process mode.
-  ChildThread(const std::string& channel_name);
+  explicit ChildThread(const std::string& channel_name);
   virtual ~ChildThread();
 
   // IPC::Message::Sender implementation:
diff --git a/chrome/common/chrome_plugin_api.h b/chrome/common/chrome_plugin_api.h
index d30357c..e5230cd 100644
--- a/chrome/common/chrome_plugin_api.h
+++ b/chrome/common/chrome_plugin_api.h
@@ -563,4 +563,4 @@ typedef CPError (STDCALL *CP_InitializeFunc)(
 } // extern "C"
 #endif
 
-#endif // CHROME_COMMON_CHROME_PLUGIN_API_H__
+#endif  // CHROME_COMMON_CHROME_PLUGIN_API_H_
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index b2dca62..0193708 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -65,7 +65,7 @@ class ChromePluginLib : public base::RefCounted<ChromePluginLib>  {
  private:
   friend class base::RefCounted<ChromePluginLib>;
 
-  ChromePluginLib(const FilePath& filename);
+  explicit ChromePluginLib(const FilePath& filename);
   ~ChromePluginLib();
 
   // Method to initialize a Plugin.
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index 2f24243..7714a53 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/chrome/common/chrome_plugin_util.h
@@ -42,7 +42,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
  public:
   static void DestroyAllHelpersForPlugin(ChromePluginLib* plugin);
 
-  PluginHelper(ChromePluginLib* plugin);
+  explicit PluginHelper(ChromePluginLib* plugin);
   virtual ~PluginHelper();
 
   // NotificationObserver
@@ -60,7 +60,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
 
 // A class of utility functions for dealing with request responses.
 class PluginResponseUtils {
-public:
+ public:
   // Helper to convert request load flags from the plugin API to the net API
   // versions.
   static uint32 CPLoadFlagsToNetFlags(uint32 flags);
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 87ab9b6..1a665d4 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -330,7 +330,7 @@ bool Extension::LoadGlobsHelper(
     int content_script_index,
     const wchar_t* globs_property_name,
     std::string* error,
-    void (UserScript::*add_method) (const std::string& glob),
+    void(UserScript::*add_method)(const std::string& glob),
     UserScript *instance) {
   if (!content_script->HasKey(globs_property_name))
     return true;  // they are optional
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 24afa3a..8cd5da3 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -302,7 +302,7 @@ class Extension {
                        int content_script_index,
                        const wchar_t* globs_property_name,
                        std::string* error,
-                       void (UserScript::*add_method) (const std::string& glob),
+                       void(UserScript::*add_method)(const std::string& glob),
                        UserScript *instance);
 
   // Helper method to load an ExtensionAction from the page_action or
diff --git a/chrome/common/extensions/extension_error_reporter.h b/chrome/common/extensions/extension_error_reporter.h
index aa17205..60d6af3 100644
--- a/chrome/common/extensions/extension_error_reporter.h
+++ b/chrome/common/extensions/extension_error_reporter.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_COMMON_EXTENSIONS_ERROR_REPORTER_H_
-#define CHROME_COMMON_EXTENSIONS_ERROR_REPORTER_H_
+#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
+#define CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
 
 #include <string>
 #include <vector>
@@ -40,11 +40,11 @@ class ExtensionErrorReporter {
  private:
   static ExtensionErrorReporter* instance_;
 
-  ExtensionErrorReporter(bool enable_noisy_errors);
+  explicit ExtensionErrorReporter(bool enable_noisy_errors);
 
   MessageLoop* ui_loop_;
   std::vector<std::string> errors_;
   bool enable_noisy_errors_;
 };
 
-#endif  // CHROME_COMMON_EXTENSIONS_ERROR_REPORTER_H_
+#endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
diff --git a/chrome/common/extensions/extension_error_utils.h b/chrome/common/extensions/extension_error_utils.h
index fdd9b03..54db8ba 100644
--- a/chrome/common/extensions/extension_error_utils.h
+++ b/chrome/common/extensions/extension_error_utils.h
@@ -8,7 +8,7 @@
 #include <string>
 
 class ExtensionErrorUtils {
-public:
+ public:
   // Creates an error messages from a pattern.
   static std::string FormatErrorMessage(const std::string& format,
     const std::string& s1);
diff --git a/chrome/common/gears_api.h b/chrome/common/gears_api.h
index 30f5e2e..9aba014 100644
--- a/chrome/common/gears_api.h
+++ b/chrome/common/gears_api.h
@@ -94,4 +94,4 @@ typedef struct _GearsCreateShortcutResult {
 } // extern "C"
 #endif
 
-#endif // CHROME_COMMON_GEARS_API_H__
+#endif  // CHROME_COMMON_GEARS_API_H_
diff --git a/chrome/common/important_file_writer.h b/chrome/common/important_file_writer.h
index bdf2223..4b70622 100644
--- a/chrome/common/important_file_writer.h
+++ b/chrome/common/important_file_writer.h
@@ -50,7 +50,7 @@ class ImportantFileWriter : public NonThreadSafe {
   // Initialize the writer.
   // |path| is the name of file to write.
   // All non-const methods, ctor and dtor must be called on the same thread.
-  ImportantFileWriter(const FilePath& path);
+  explicit ImportantFileWriter(const FilePath& path);
 
   // You have to ensure that there are no pending writes at the moment
   // of destruction.
diff --git a/chrome/common/json_value_serializer.h b/chrome/common/json_value_serializer.h
index 3dd8f14..1f1e556 100644
--- a/chrome/common/json_value_serializer.h
+++ b/chrome/common/json_value_serializer.h
@@ -16,7 +16,7 @@ class JSONStringValueSerializer : public ValueSerializer {
   // json_string is the string that will be source of the deserialization
   // or the destination of the serialization.  The caller of the constructor
   // retains ownership of the string.
-  JSONStringValueSerializer(std::string* json_string)
+  explicit JSONStringValueSerializer(std::string* json_string)
       : json_string_(json_string),
         initialized_with_const_string_(false),
         pretty_print_(false),
@@ -25,7 +25,7 @@ class JSONStringValueSerializer : public ValueSerializer {
 
   // This version allows initialization with a const string reference for
   // deserialization only.
-  JSONStringValueSerializer(const std::string& json_string)
+  explicit JSONStringValueSerializer(const std::string& json_string)
       : json_string_(&const_cast<std::string&>(json_string)),
         initialized_with_const_string_(true),
         pretty_print_(false),
diff --git a/chrome/common/libxml_utils.cc b/chrome/common/libxml_utils.cc
index c21a363..8b8e39f 100644
--- a/chrome/common/libxml_utils.cc
+++ b/chrome/common/libxml_utils.cc
@@ -117,9 +117,9 @@ bool XmlReader::SkipToElement() {
 
 // XmlWriter functions
 
-XmlWriter::XmlWriter() :
-    writer_(NULL),
-    buffer_(NULL) {}
+XmlWriter::XmlWriter()
+    : writer_(NULL),
+      buffer_(NULL) {}
 
 XmlWriter::~XmlWriter() {
   if (writer_)
diff --git a/chrome/common/logging_chrome.h b/chrome/common/logging_chrome.h
index 434b2fe..f069523 100644
--- a/chrome/common/logging_chrome.h
+++ b/chrome/common/logging_chrome.h
@@ -55,4 +55,4 @@ size_t GetFatalAssertions(AssertionList* assertions);
 
 } // namespace logging
 
-#endif
+#endif  // CHROME_COMMON_LOGGING_CHROME_H_
diff --git a/chrome/common/mru_cache.h b/chrome/common/mru_cache.h
index 9190d9d..b2643f8 100644
--- a/chrome/common/mru_cache.h
+++ b/chrome/common/mru_cache.h
@@ -53,7 +53,7 @@ class MRUCacheBase {
   // a new item is inserted. If the caller wants to manager this itself (for
   // example, maybe it has special work to do when something is evicted), it
   // can pass NO_AUTO_EVICT to not restrict the cache size.
-  MRUCacheBase(size_type max_size) : max_size_(max_size) {
+  explicit MRUCacheBase(size_type max_size) : max_size_(max_size) {
   }
 
   virtual ~MRUCacheBase() {
@@ -205,7 +205,7 @@ class MRUCache : public MRUCacheBase<KeyType,
 
  public:
   // See MRUCacheBase, noting the possibility of using NO_AUTO_EVICT.
-  MRUCache(typename ParentType::size_type max_size)
+  explicit MRUCache(typename ParentType::size_type max_size)
       : ParentType(max_size) {
   }
   virtual ~MRUCache() {
@@ -239,7 +239,7 @@ class OwningMRUCache
 
  public:
   // See MRUCacheBase, noting the possibility of using NO_AUTO_EVICT.
-  OwningMRUCache(typename ParentType::size_type max_size)
+  explicit OwningMRUCache(typename ParentType::size_type max_size)
       : ParentType(max_size) {
   }
   virtual ~OwningMRUCache() {
diff --git a/chrome/common/net/dns.h b/chrome/common/net/dns.h
index 7a3f364..8c91c13 100644
--- a/chrome/common/net/dns.h
+++ b/chrome/common/net/dns.h
@@ -5,9 +5,8 @@
 // This file has shared types used across IPC between render_dns_master.cc
 // and dns_master.cc
 
-
-#ifndef CHROME_COMMON_DNS_H_
-#define CHROME_COMMON_DNS_H_
+#ifndef CHROME_COMMON_NET_DNS_H_
+#define CHROME_COMMON_NET_DNS_H_
 
 #include <string>
 #include <vector>
@@ -21,4 +20,4 @@ namespace chrome_common_net {
 typedef std::vector<std::string> NameList;
 }
 
-#endif  // CHROME_COMMON_DNS_H_
+#endif  // CHROME_COMMON_NET_DNS_H_
diff --git a/chrome/common/net/socket_stream.h b/chrome/common/net/socket_stream.h
index 844328b..6c1ad92 100644
--- a/chrome/common/net/socket_stream.h
+++ b/chrome/common/net/socket_stream.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_COMMON_SOCKET_STREAM_H_
-#define CHROME_COMMON_SOCKET_STREAM_H_
+#ifndef CHROME_COMMON_NET_SOCKET_STREAM_H_
+#define CHROME_COMMON_NET_SOCKET_STREAM_H_
 
 namespace chrome_common_net {
 
@@ -11,4 +11,4 @@ const int kNoSocketId = 0;
 
 }  // namespace chrome_common_net
 
-#endif  // CHROME_COMMON_SOCKET_STREAM_H_
+#endif  // CHROME_COMMON_NET_SOCKET_STREAM_H_
diff --git a/chrome/common/notification_details.h b/chrome/common/notification_details.h
index ee10111..2c914d7 100644
--- a/chrome/common/notification_details.h
+++ b/chrome/common/notification_details.h
@@ -33,7 +33,7 @@ class NotificationDetails {
   }
 
  protected:
-  NotificationDetails(const void* ptr) : ptr_(ptr) {}
+  explicit NotificationDetails(const void* ptr) : ptr_(ptr) {}
 
   // Declaring this const allows Details<T> to be used with both T = Foo and
   // T = const Foo.
@@ -43,8 +43,9 @@ class NotificationDetails {
 template <class T>
 class Details : public NotificationDetails {
  public:
-  Details(T* ptr) : NotificationDetails(ptr) {}
-  Details(const NotificationDetails& other)
+  // TODO(erg): Our code hard relies on implicit conversion
+  Details(T* ptr) : NotificationDetails(ptr) {}  // NOLINT
+  Details(const NotificationDetails& other)      // NOLINT
     : NotificationDetails(other) {}
 
   T* operator->() const { return ptr(); }
diff --git a/chrome/common/notification_source.h b/chrome/common/notification_source.h
index fb37124..98b9f66 100644
--- a/chrome/common/notification_source.h
+++ b/chrome/common/notification_source.h
@@ -31,7 +31,7 @@ class NotificationSource {
   }
 
  protected:
-  NotificationSource(const void* ptr) : ptr_(ptr) {}
+  explicit NotificationSource(const void* ptr) : ptr_(ptr) {}
 
   // Declaring this const allows Source<T> to be used with both T = Foo and
   // T = const Foo.
@@ -41,9 +41,9 @@ class NotificationSource {
 template <class T>
 class Source : public NotificationSource {
  public:
-  Source(T* ptr) : NotificationSource(ptr) {}
-
-  Source(const NotificationSource& other)
+  // TODO(erg): Our code hard relies on implicit conversion
+  Source(T* ptr) : NotificationSource(ptr) {}  // NOLINT
+  Source(const NotificationSource& other)      // NOLINT
     : NotificationSource(other) {}
 
   T* operator->() const { return ptr(); }
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 02514f8..8d4b747 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -774,7 +774,8 @@ class NotificationType {
     NOTIFICATION_TYPE_COUNT
   };
 
-  NotificationType(Type v) : value(v) {}
+  // TODO(erg): Our notification system relies on implicit conversion.
+  NotificationType(Type v) : value(v) {}  // NOLINT
 
   bool operator==(NotificationType t) const { return value == t.value; }
   bool operator!=(NotificationType t) const { return value != t.value; }
diff --git a/chrome/common/property_bag.h b/chrome/common/property_bag.h
index 602c161..778d0b9 100644
--- a/chrome/common/property_bag.h
+++ b/chrome/common/property_bag.h
@@ -154,7 +154,7 @@ class PropertyAccessor : public PropertyAccessorBase {
  private:
   class Container : public PropertyBag::Prop {
    public:
-    Container(const T& data) : data_(data) {}
+    explicit Container(const T& data) : data_(data) {}
 
     T* get() { return &data_; }
     const T* get() const { return &data_; }
diff --git a/chrome/common/ref_counted_util.h b/chrome/common/ref_counted_util.h
index 801aa42..b04580e 100644
--- a/chrome/common/ref_counted_util.h
+++ b/chrome/common/ref_counted_util.h
@@ -11,11 +11,11 @@
 // RefCountedVector is just a vector wrapped up with
 // RefCountedThreadSafe.
 template<class T>
-class RefCountedVector :
-    public base::RefCountedThreadSafe<RefCountedVector<T> > {
+class RefCountedVector
+    : public base::RefCountedThreadSafe<RefCountedVector<T> > {
  public:
   RefCountedVector() {}
-  RefCountedVector(const std::vector<T>& initializer)
+  explicit RefCountedVector(const std::vector<T>& initializer)
       : data(initializer) {}
 
   std::vector<T> data;
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 03ad8d1..866d9aa 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1,4 +1,4 @@
-  // Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index a55237d..36c66a9 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -20,7 +20,7 @@
 #include "webkit/glue/webkit_glue.h"
 
 // Uncomment to enable logging of request traffic
-//#define LOG_RESOURCE_REQUESTS
+// #define LOG_RESOURCE_REQUESTS
 
 #ifdef LOG_RESOURCE_REQUESTS
 # define RESOURCE_LOG(stuff) LOG(INFO) << stuff
diff --git a/chrome/common/sqlite_compiled_statement.h b/chrome/common/sqlite_compiled_statement.h
index 2ddd81b..01b7f1e 100644
--- a/chrome/common/sqlite_compiled_statement.h
+++ b/chrome/common/sqlite_compiled_statement.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_COMMON_SQLITE_COMPILED_STATEMENT_
-#define CHROME_COMMON_SQLITE_COMPILED_STATEMENT_
+#ifndef CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
+#define CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
 
 #include <map>
 #include <string>
@@ -132,4 +132,4 @@ class SqliteCompiledStatement {
 #define SQLITE_UNIQUE_STATEMENT(var_name, cache, sql) \
     SqliteCompiledStatement var_name(__FILE__, __LINE__, cache, sql)
 
-#endif  // CHROME_COMMON_SQLITE_COMPILED_STATEMENT_
+#endif  // CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
index ece02f1..d5e8df3 100644
--- a/chrome/common/sqlite_utils.h
+++ b/chrome/common/sqlite_utils.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_COMMON_SQLITEUTILS_H_
-#define CHROME_COMMON_SQLITEUTILS_H_
+#ifndef CHROME_COMMON_SQLITE_UTILS_H_
+#define CHROME_COMMON_SQLITE_UTILS_H_
 
 #include <string>
 #include <vector>
@@ -414,4 +414,4 @@ bool DoesSqliteTableHaveRow(sqlite3* db, const char* table_name);
 int sqlite3Preload(sqlite3* db);
 #endif
 
-#endif  // CHROME_COMMON_SQLITEUTILS_H_
+#endif  // CHROME_COMMON_SQLITE_UTILS_H_
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 8356df2..931a96f 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -48,7 +48,7 @@ namespace printing {
 
 class PrintViewManager : public RenderViewHostDelegate::Printing {
  public:
-  PrintViewManager(TabContents& owner) : owner_(owner) { }
+  explicit PrintViewManager(TabContents& owner) : owner_(owner) { }
   void Stop() { NOTIMPLEMENTED(); }
   void Destroy() { }
   bool OnRenderViewGone(RenderViewHost*) {
diff --git a/chrome/common/thumbnail_score.h b/chrome/common/thumbnail_score.h
index c1ebb81..c3a5a90 100644
--- a/chrome/common/thumbnail_score.h
+++ b/chrome/common/thumbnail_score.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_COMMON_THUMBNAIL_SCORE_H__
-#define CHROME_BROWSER_COMMON_THUMBNAIL_SCORE_H__
+#ifndef CHROME_COMMON_THUMBNAIL_SCORE_H_
+#define CHROME_COMMON_THUMBNAIL_SCORE_H_
 
 #include "base/time.h"
 
@@ -79,4 +79,4 @@ struct ThumbnailScore {
 bool ShouldReplaceThumbnailWith(const ThumbnailScore& current,
                                 const ThumbnailScore& replacement);
 
-#endif  // CHROME_BROWSER_COMMON_THUMBNAIL_SCORE_H__
+#endif  // CHROME_COMMON_THUMBNAIL_SCORE_H_
diff --git a/chrome/common/visitedlink_common.cc b/chrome/common/visitedlink_common.cc
index 9c2b231..2782311 100644
--- a/chrome/common/visitedlink_common.cc
+++ b/chrome/common/visitedlink_common.cc
@@ -10,9 +10,9 @@
 const VisitedLinkCommon::Fingerprint VisitedLinkCommon::null_fingerprint_ = 0;
 const VisitedLinkCommon::Hash VisitedLinkCommon::null_hash_ = -1;
 
-VisitedLinkCommon::VisitedLinkCommon() :
-    hash_table_(NULL),
-    table_length_(0) {
+VisitedLinkCommon::VisitedLinkCommon()
+    : hash_table_(NULL),
+      table_length_(0) {
 }
 
 VisitedLinkCommon::~VisitedLinkCommon() {
diff --git a/chrome/common/visitedlink_common.h b/chrome/common/visitedlink_common.h
index ac8652b..0e79c04 100644
--- a/chrome/common/visitedlink_common.h
+++ b/chrome/common/visitedlink_common.h
@@ -134,4 +134,4 @@ class VisitedLinkCommon {
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkCommon);
 };
 
-#endif // WIN_COMMON_VISITEDLINK_COMMON_H__
+#endif  // CHROME_COMMON_VISITEDLINK_COMMON_H_
diff --git a/chrome/common/web_resource/web_resource_unpacker.h b/chrome/common/web_resource/web_resource_unpacker.h
index 95600f9..f07c06f 100644
--- a/chrome/common/web_resource/web_resource_unpacker.h
+++ b/chrome/common/web_resource/web_resource_unpacker.h
@@ -9,8 +9,8 @@
 // it will be set up to unpack and verify image data in addition to
 // just parsing a JSON feed.
 
-#ifndef CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
-#define CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
+#ifndef CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
+#define CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
 
 #include <string>
 
@@ -52,6 +52,6 @@ class WebResourceUnpacker {
   DISALLOW_COPY_AND_ASSIGN(WebResourceUnpacker);
 };
 
-#endif  // CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
+#endif  // CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
 
 
diff --git a/chrome/common/win_safe_util.h b/chrome/common/win_safe_util.h
index 8705d8a..d9c7097 100644
--- a/chrome/common/win_safe_util.h
+++ b/chrome/common/win_safe_util.h
@@ -48,4 +48,4 @@ bool SetInternetZoneIdentifier(const FilePath& full_path);
 
 }  // namespace win_util
 
-#endif // CHROME_COMMON_WIN_SAFE_UTIL_H__
+#endif  // CHROME_COMMON_WIN_SAFE_UTIL_H_