Cpplint for apps/, extensions/

BUG=

Review URL: https://codereview.chromium.org/247143004

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

18 files changed, 39 insertions, 40 deletions

diff --git a/apps/app_shim/app_shim_host_mac.h b/apps/app_shim/app_shim_host_mac.h
index b2b0882..606ea87 100644
--- a/apps/app_shim/app_shim_host_mac.h
+++ b/apps/app_shim/app_shim_host_mac.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_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
+#ifndef APPS_APP_SHIM_APP_SHIM_HOST_MAC_H_
+#define APPS_APP_SHIM_APP_SHIM_HOST_MAC_H_
 
 #include <string>
 #include <vector>
@@ -82,4 +82,4 @@ class AppShimHost : public IPC::Listener,
   bool initial_launch_finished_;
 };
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
+#endif  // APPS_APP_SHIM_APP_SHIM_HOST_MAC_H_
diff --git a/apps/app_shim/app_shim_host_manager_mac.h b/apps/app_shim/app_shim_host_manager_mac.h
index 4b945eb..615f80f 100644
--- a/apps/app_shim/app_shim_host_manager_mac.h
+++ b/apps/app_shim/app_shim_host_manager_mac.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_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
+#ifndef APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
+#define APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/memory/ref_counted.h"
@@ -65,4 +65,4 @@ class AppShimHostManager
   DISALLOW_COPY_AND_ASSIGN(AppShimHostManager);
 };
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
+#endif  // APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
diff --git a/apps/app_shim/extension_app_shim_handler_mac.h b/apps/app_shim/extension_app_shim_handler_mac.h
index 0fc8a84..ed277f3 100644
--- a/apps/app_shim/extension_app_shim_handler_mac.h
+++ b/apps/app_shim/extension_app_shim_handler_mac.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 APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_H_
-#define APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_H_
+#ifndef APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_
+#define APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_
 
 #include <map>
 #include <string>
@@ -144,4 +144,4 @@ class ExtensionAppShimHandler : public AppShimHandler,
 
 }  // namespace apps
 
-#endif  // APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_H_
+#endif  // APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_
diff --git a/apps/app_window.cc b/apps/app_window.cc
index 5e872f5..6d802aa 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -1033,7 +1033,6 @@ AppWindow::CreateParams AppWindow::LoadDefaults(CreateParams params)
                            &cached_bounds,
                            &cached_screen_bounds,
                            &cached_state)) {
-
       // App window has cached screen bounds, make sure it fits on screen in
       // case the screen resolution changed.
       gfx::Screen* screen = gfx::Screen::GetNativeScreen();
diff --git a/apps/app_window_contents.h b/apps/app_window_contents.h
index 0b4ac32..c5b3b02 100644
--- a/apps/app_window_contents.h
+++ b/apps/app_window_contents.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_EXTENSIONS_APP_WINDOW_CONTENTS_H_
-#define CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_
+#ifndef APPS_APP_WINDOW_CONTENTS_H_
+#define APPS_APP_WINDOW_CONTENTS_H_
 
 #include <vector>
 
@@ -77,4 +77,4 @@ class AppWindowContentsImpl
 
 }  // namespace apps
 
-#endif  // CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_
+#endif  // APPS_APP_WINDOW_CONTENTS_H_
diff --git a/apps/app_window_geometry_cache.cc b/apps/app_window_geometry_cache.cc
index e12794b..c89988b 100644
--- a/apps/app_window_geometry_cache.cc
+++ b/apps/app_window_geometry_cache.cc
@@ -150,7 +150,6 @@ bool AppWindowGeometryCache::GetGeometry(const std::string& extension_id,
                                          gfx::Rect* bounds,
                                          gfx::Rect* screen_bounds,
                                          ui::WindowShowState* window_state) {
-
   std::map<std::string, ExtensionData>::const_iterator extension_data_it =
       cache_.find(extension_id);
 
diff --git a/apps/app_window_geometry_cache.h b/apps/app_window_geometry_cache.h
index 1bc69fa..2076428 100644
--- a/apps/app_window_geometry_cache.h
+++ b/apps/app_window_geometry_cache.h
@@ -65,7 +65,7 @@ class AppWindowGeometryCache : public KeyedService,
                                         const gfx::Rect& bounds) = 0;
 
    protected:
-    virtual ~Observer() {};
+    virtual ~Observer() {}
   };
 
   AppWindowGeometryCache(Profile* profile, extensions::ExtensionPrefs* prefs);
diff --git a/apps/app_window_geometry_cache_unittest.cc b/apps/app_window_geometry_cache_unittest.cc
index deda109..ccff882 100644
--- a/apps/app_window_geometry_cache_unittest.cc
+++ b/apps/app_window_geometry_cache_unittest.cc
@@ -342,4 +342,4 @@ TEST_F(AppWindowGeometryCacheTest, MaxWindows) {
   }
 }
 
-}  // namespace extensions
+}  // namespace apps
diff --git a/apps/app_window_registry.cc b/apps/app_window_registry.cc
index 3832849..2be3c78 100644
--- a/apps/app_window_registry.cc
+++ b/apps/app_window_registry.cc
@@ -304,4 +304,4 @@ content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
       context);
 }
 
-}  // namespace extensions
+}  // namespace apps
diff --git a/apps/app_window_registry.h b/apps/app_window_registry.h
index 5be2079..1bce91d 100644
--- a/apps/app_window_registry.h
+++ b/apps/app_window_registry.h
@@ -142,6 +142,6 @@ class AppWindowRegistry : public KeyedService {
   base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
 };
 
-}  // namespace extensions
+}  // namespace apps
 
 #endif  // APPS_APP_WINDOW_REGISTRY_H_
diff --git a/apps/browser_context_keyed_service_factories.h b/apps/browser_context_keyed_service_factories.h
index d7d3fb8..2e206d5 100644
--- a/apps/browser_context_keyed_service_factories.h
+++ b/apps/browser_context_keyed_service_factories.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 APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
-#define APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
+#ifndef APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
+#define APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
 
 namespace apps {
 
@@ -13,4 +13,4 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
 }  // namespace apps
 
-#endif  // APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
+#endif  // APPS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
diff --git a/extensions/browser/admin_policy.h b/extensions/browser/admin_policy.h
index 6091bf8..50b62c4 100644
--- a/extensions/browser/admin_policy.h
+++ b/extensions/browser/admin_policy.h
@@ -37,6 +37,6 @@ bool UserMayModifySettings(const Extension* extension, base::string16* error);
 bool MustRemainEnabled(const Extension* extension, base::string16* error);
 
 }  // namespace
-}  // namespace
+}  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_ADMIN_POLICY_H_
diff --git a/extensions/browser/browser_context_keyed_service_factories.h b/extensions/browser/browser_context_keyed_service_factories.h
index 9801a7c..ab8c8c2 100644
--- a/extensions/browser/browser_context_keyed_service_factories.h
+++ b/extensions/browser/browser_context_keyed_service_factories.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 EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
-#define EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
+#ifndef EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
+#define EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
 
 namespace extensions {
 
@@ -13,4 +13,4 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_
+#endif  // EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
diff --git a/extensions/browser/extension_error.h b/extensions/browser/extension_error.h
index e3a249d..ea3c082 100644
--- a/extensions/browser/extension_error.h
+++ b/extensions/browser/extension_error.h
@@ -84,6 +84,7 @@ class ExtensionError {
   // The number of times this error has occurred.
   size_t occurrences_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionError);
 };
 
diff --git a/extensions/browser/extension_error_test_util.cc b/extensions/browser/extension_error_test_util.cc
index cdf4917..cf4a4f0 100644
--- a/extensions/browser/extension_error_test_util.cc
+++ b/extensions/browser/extension_error_test_util.cc
@@ -35,15 +35,16 @@ scoped_ptr<ExtensionError> CreateNewRuntimeError(
                             content::kStandardSchemeSeparator +
                             extension_id);
 
-  return scoped_ptr<ExtensionError>(new RuntimeError(
-      extension_id,
-      from_incognito,
-      source,
-      base::UTF8ToUTF16(message),
-      stack_trace,
-      GURL::EmptyGURL(),  // no context url
-      logging::LOG_INFO,
-      0, 0 /* Render [View|Process] ID */ ));
+  return scoped_ptr<ExtensionError>(
+      new RuntimeError(extension_id,
+                       from_incognito,
+                       source,
+                       base::UTF8ToUTF16(message),
+                       stack_trace,
+                       GURL::EmptyGURL(),  // no context url
+                       logging::LOG_INFO,
+                       0,
+                       0 /* Render [View|Process] ID */));
 }
 
 scoped_ptr<ExtensionError> CreateNewRuntimeError(
diff --git a/extensions/browser/extension_message_filter.h b/extensions/browser/extension_message_filter.h
index 62c4f02..da2bff2 100644
--- a/extensions/browser/extension_message_filter.h
+++ b/extensions/browser/extension_message_filter.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 EXTENSIONS_BROWSER_EXTENSION_RENDER_MESSAGE_FILTER_H_
-#define EXTENSIONS_BROWSER_EXTENSION_RENDER_MESSAGE_FILTER_H_
+#ifndef EXTENSIONS_BROWSER_EXTENSION_MESSAGE_FILTER_H_
+#define EXTENSIONS_BROWSER_EXTENSION_MESSAGE_FILTER_H_
 
 #include <string>
 
@@ -88,4 +88,4 @@ class ExtensionMessageFilter : public content::BrowserMessageFilter {
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_EXTENSION_RENDER_MESSAGE_FILTER_H_
+#endif  // EXTENSIONS_BROWSER_EXTENSION_MESSAGE_FILTER_H_
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc
index 05b7702..9a39331 100644
--- a/extensions/browser/extension_prefs.cc
+++ b/extensions/browser/extension_prefs.cc
@@ -1915,7 +1915,6 @@ int64 ExtensionPrefs::GetNextStorageThreshold(
 
 void ExtensionPrefs::SetNextStorageThreshold(const std::string& extension_id,
                                              int64 next_threshold) {
-
   ScopedExtensionPrefUpdate update(prefs_, extension_id);
   SaveInt64(update.Get(), kPrefNextStorageThreshold, next_threshold);
 }
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h
index 4ff16a5..90a9b83 100644
--- a/extensions/browser/extension_prefs.h
+++ b/extensions/browser/extension_prefs.h
@@ -113,11 +113,11 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
     virtual T* Create();
 
    private:
-    DISALLOW_COPY_AND_ASSIGN(ScopedUpdate);
-
     DictionaryPrefUpdate update_;
     const std::string extension_id_;
     const std::string key_;
+
+    DISALLOW_COPY_AND_ASSIGN(ScopedUpdate);
   };
   typedef ScopedUpdate<base::DictionaryValue, base::Value::TYPE_DICTIONARY>
       ScopedDictionaryUpdate;