diff options
author | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 08:51:51 +0000 |
---|---|---|
committer | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 08:51:51 +0000 |
commit | 244be13cb0df5230da200e459cbefae95fa15657 (patch) | |
tree | 2d54ce51a94d6b2e8a415e7cca13deec9c8f5dad | |
parent | 8750bd327aaf5ee052093f4a5e40fbfea911f79f (diff) | |
download | chromium_src-244be13cb0df5230da200e459cbefae95fa15657.zip chromium_src-244be13cb0df5230da200e459cbefae95fa15657.tar.gz chromium_src-244be13cb0df5230da200e459cbefae95fa15657.tar.bz2 |
cleanup: cpplint src/extension/*
no logical change.
BUG=
Review URL: https://codereview.chromium.org/225493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262356 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | extensions/browser/renderer_startup_helper.h | 6 | ||||
-rw-r--r-- | extensions/browser/view_type_utils.cc | 2 | ||||
-rw-r--r-- | extensions/browser/view_type_utils.h | 2 | ||||
-rw-r--r-- | extensions/common/crx_file.h | 1 | ||||
-rw-r--r-- | extensions/common/csp_validator.cc | 4 | ||||
-rw-r--r-- | extensions/common/extension_api.h | 2 | ||||
-rw-r--r-- | extensions/common/extension_messages.cc | 2 | ||||
-rw-r--r-- | extensions/common/stack_frame.h | 6 | ||||
-rw-r--r-- | extensions/common/switches.h | 2 | ||||
-rw-r--r-- | extensions/common/url_pattern_set.h | 6 | ||||
-rw-r--r-- | extensions/common/url_pattern_set_unittest.cc | 4 | ||||
-rw-r--r-- | extensions/common/url_pattern_unittest.cc | 7 | ||||
-rw-r--r-- | extensions/common/user_script_unittest.cc | 3 | ||||
-rw-r--r-- | extensions/common/value_builder.h | 2 |
14 files changed, 24 insertions, 25 deletions
diff --git a/extensions/browser/renderer_startup_helper.h b/extensions/browser/renderer_startup_helper.h index 434b912..2d7c271 100644 --- a/extensions/browser/renderer_startup_helper.h +++ b/extensions/browser/renderer_startup_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 EXTENSIONS_BROWSER_RENDER_PROCESS_HELPER_H_ -#define EXTENSIONS_BROWSER_RENDER_PROCESS_HELPER_H_ +#ifndef EXTENSIONS_BROWSER_RENDERER_STARTUP_HELPER_H_ +#define EXTENSIONS_BROWSER_RENDERER_STARTUP_HELPER_H_ #include "base/compiler_specific.h" #include "base/memory/singleton.h" @@ -71,4 +71,4 @@ class RendererStartupHelperFactory : public BrowserContextKeyedServiceFactory { } // namespace extensions -#endif // EXTENSIONS_BROWSER_RENDER_PROCESS_HELPER_H_ +#endif // EXTENSIONS_BROWSER_RENDERER_STARTUP_HELPER_H_ diff --git a/extensions/browser/view_type_utils.cc b/extensions/browser/view_type_utils.cc index a28381f..5179a05 100644 --- a/extensions/browser/view_type_utils.cc +++ b/extensions/browser/view_type_utils.cc @@ -41,4 +41,4 @@ void SetViewType(WebContents* tab, ViewType type) { tab->SetUserData(&kViewTypeUserDataKey, new ViewTypeUserData(type)); } -} // namespace chrome +} // namespace extensions diff --git a/extensions/browser/view_type_utils.h b/extensions/browser/view_type_utils.h index 4667be4..aea3d24 100644 --- a/extensions/browser/view_type_utils.h +++ b/extensions/browser/view_type_utils.h @@ -19,6 +19,6 @@ namespace extensions { ViewType GetViewType(content::WebContents* tab); void SetViewType(content::WebContents* tab, ViewType type); -} // namespace chrome +} // namespace extensions #endif // EXTENSIONS_BROWSER_VIEW_TYPE_UTILS_H_ diff --git a/extensions/common/crx_file.h b/extensions/common/crx_file.h index 3ac8189..d7c33ab 100644 --- a/extensions/common/crx_file.h +++ b/extensions/common/crx_file.h @@ -16,7 +16,6 @@ namespace extensions { // the header is valid or not. class CrxFile { public: - // The size of the magic character sequence at the beginning of each crx // file, in bytes. This should be a multiple of 4. static const size_t kCrxFileHeaderMagicSize = 4; diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc index 05076f7..c56556f 100644 --- a/extensions/common/csp_validator.cc +++ b/extensions/common/csp_validator.cc @@ -195,6 +195,6 @@ bool ContentSecurityPolicyIsSandboxed( return seen_sandbox; } -} // csp_validator +} // namespace csp_validator -} // extensions +} // namespace extensions diff --git a/extensions/common/extension_api.h b/extensions/common/extension_api.h index 1b2ad3e..53906fb 100644 --- a/extensions/common/extension_api.h +++ b/extensions/common/extension_api.h @@ -145,6 +145,6 @@ class ExtensionAPI { DISALLOW_COPY_AND_ASSIGN(ExtensionAPI); }; -} // namespace extensions +} // namespace extensions #endif // EXTENSIONS_COMMON_EXTENSION_API_H_ diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc index 61c2297..fc7c273 100644 --- a/extensions/common/extension_messages.cc +++ b/extensions/common/extension_messages.cc @@ -24,7 +24,7 @@ using extensions::URLPatternSet; ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params() : location(Manifest::INVALID_LOCATION), - creation_flags(Extension::NO_FLAGS){} + creation_flags(Extension::NO_FLAGS) {} ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {} diff --git a/extensions/common/stack_frame.h b/extensions/common/stack_frame.h index 7052605..df66180 100644 --- a/extensions/common/stack_frame.h +++ b/extensions/common/stack_frame.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_COMMON_STACK_FRAME -#define EXTENSIONS_COMMON_STACK_FRAME +#ifndef EXTENSIONS_COMMON_STACK_FRAME_H_ +#define EXTENSIONS_COMMON_STACK_FRAME_H_ #include <vector> @@ -37,5 +37,5 @@ typedef std::vector<StackFrame> StackTrace; } // namespace extensions -#endif // EXTENSIONS_COMMON_STACK_FRAME +#endif // EXTENSIONS_COMMON_STACK_FRAME_H_ diff --git a/extensions/common/switches.h b/extensions/common/switches.h index 2d26dc8..f79e32fe 100644 --- a/extensions/common/switches.h +++ b/extensions/common/switches.h @@ -29,4 +29,4 @@ extern const char kWhitelistedExtensionID[]; } // namespace extensions -#endif // EXTENSIONS_COMMON_SWITCHES_H_ +#endif // EXTENSIONS_COMMON_SWITCHES_H_ diff --git a/extensions/common/url_pattern_set.h b/extensions/common/url_pattern_set.h index da6ad13..0cab667 100644 --- a/extensions/common/url_pattern_set.h +++ b/extensions/common/url_pattern_set.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_COMMMON_URL_PATTERN_SET_H_ -#define EXTENSIONS_COMMMON_URL_PATTERN_SET_H_ +#ifndef EXTENSIONS_COMMON_URL_PATTERN_SET_H_ +#define EXTENSIONS_COMMON_URL_PATTERN_SET_H_ #include <set> @@ -102,4 +102,4 @@ class URLPatternSet { } // namespace extensions -#endif // EXTENSIONS_COMMMON_URL_PATTERN_SET_H_ +#endif // EXTENSIONS_COMMON_URL_PATTERN_SET_H_ diff --git a/extensions/common/url_pattern_set_unittest.cc b/extensions/common/url_pattern_set_unittest.cc index 89b5435..267743a7 100644 --- a/extensions/common/url_pattern_set_unittest.cc +++ b/extensions/common/url_pattern_set_unittest.cc @@ -31,7 +31,7 @@ URLPatternSet Patterns(const std::string& pattern1, return set; } -} +} // namespace TEST(URLPatternSetTest, Empty) { URLPatternSet set; @@ -276,7 +276,6 @@ TEST(URLPatternSetTest, NwayUnion) { // List with 2 elements. { - std::vector<URLPatternSet> test; test.push_back(Patterns(google_a, google_b)); test.push_back(Patterns(google_b, google_c)); @@ -364,7 +363,6 @@ TEST(URLPatternSetTest, NwayUnion) { // List with 9 elements. { - std::vector<URLPatternSet> test; test.push_back(Patterns(google_a)); test.push_back(Patterns(google_b)); diff --git a/extensions/common/url_pattern_unittest.cc b/extensions/common/url_pattern_unittest.cc index d1cc8c2..3e0c816 100644 --- a/extensions/common/url_pattern_unittest.cc +++ b/extensions/common/url_pattern_unittest.cc @@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) { { "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" }, { "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" }, { "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" }, - { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" }, + { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" }, { "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" }, { "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" }, { "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" }, @@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) { // Port-like strings in the path should not trigger a warning. { "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" }, { "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" }, - { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" }, + { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) { @@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) { EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo"))); EXPECT_FALSE(pattern.MatchesURL( GURL("filesystem:http://www.example.com:8080/foo/"))); - EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo"))); + EXPECT_FALSE(pattern.MatchesURL( + GURL("filesystem:http://www.example.com/f/foo"))); } // Explicit port wildcard diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc index ffec4f0..90a74ce 100644 --- a/extensions/common/user_script_unittest.cc +++ b/extensions/common/user_script_unittest.cc @@ -133,7 +133,8 @@ TEST(ExtensionUserScriptTest, UrlPatternGlobInteraction) { UserScript script; URLPattern pattern(kAllSchemes); - ASSERT_EQ(URLPattern::PARSE_SUCCESS,pattern.Parse("http://www.google.com/*")); + ASSERT_EQ(URLPattern::PARSE_SUCCESS, + pattern.Parse("http://www.google.com/*")); script.add_url_pattern(pattern); script.add_glob("*bar*"); diff --git a/extensions/common/value_builder.h b/extensions/common/value_builder.h index bcb40aa..ed4c4b6 100644 --- a/extensions/common/value_builder.h +++ b/extensions/common/value_builder.h @@ -100,6 +100,6 @@ class ListBuilder { scoped_ptr<base::ListValue> list_; }; -} // namespace extensions +} // namespace extensions #endif // EXTENSIONS_COMMON_VALUE_BUILDER_H_ |