Skip to content

Commit

Permalink
lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
darkdh committed Aug 7, 2018
1 parent 9eb5e14 commit 09feca1
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
5 changes: 2 additions & 3 deletions browser/autoplay/autoplay_permission_context_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "content/public/test/web_contents_tester.h"
#include "testing/gtest/include/gtest/gtest.h"


namespace {

class AutoplayPermissionContextTest : public AutoplayPermissionContext {
Expand Down Expand Up @@ -107,8 +106,8 @@ TEST_F(AutoplayPermissionContextTests, TestInsecureQueryingUrl) {
.content_setting);
}

// There is no way to genearte a request that is automatically accepted in
// unittest by RequestPermission so we test reverse cases here
// There is no way to generate a request that is automatically accepted in
// unittest by RequestPermission, so we test reverse cases here
TEST_F(AutoplayPermissionContextTests, TestNonAutoRefresh) {
AutoplayPermissionContextTest permission_context(profile());
GURL url("https://www.example.com");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) {
return CONTENT_SETTINGS_TYPE_AUTOPLAY;
return PermissionTypeToContentSetting_ChromiumImpl(permission);
}
}

} // namespace

#define PermissionManagerFactory BravePermissionManagerFactory
#include "../../../../../chrome/browser/permissions/permission_manager.cc"
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ std::string GetPermissionRequestString(PermissionRequestType type) {
return GetPermissionRequestString_ChromiumImpl(type);
}

}
} // namespace

#include "../../../../../chrome/browser/permissions/permission_uma_util.cc"

Expand All @@ -36,4 +36,4 @@ void BraveRecordPermissionAction (ContentSettingsType permission,
}
}

}
} // namespace
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
namespace settings {
void BraveAddLocalizedStrings(content::WebUIDataSource*, Profile*);
}
} // namespace settings
#include "../../../../../../chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc"

namespace settings {
Expand Down Expand Up @@ -37,4 +37,4 @@ void BraveAddLocalizedStrings(content::WebUIDataSource* html_source,
BraveAddCommonStrings(html_source, profile);
}

}
} // namespace settings
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ std::string ContentSettingsTypeToGroupName(ContentSettingsType type) {
return ContentSettingsTypeToGroupName_ChromiumImpl(type);
}

}
} // namespace site_settings
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ void ContentSettingsRegistry::BraveInit() {

}

}
} // namespace content_settings
2 changes: 1 addition & 1 deletion chromium_src/content/child/runtime_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
WebRuntimeFeatures::EnableAutoplayMutedVideos(false);
}

}
} // namespace content

0 comments on commit 09feca1

Please sign in to comment.