Commit 08735d6a authored by rdevlin.cronin's avatar rdevlin.cronin Committed by Commit bot

Properly initialize variables in RequestContentScript::ScriptData

POD members of RequestContentScript::ScriptData weren't being initialized,
which a) is really bad because who knows what they might have been, and b)
is bad because it makes Dr. Memory unhappy.  Fix it (and pull ScriptData into
the .cc while we're at it).

BUG=409865

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

Cr-Commit-Position: refs/heads/master@{#292960}
parent 8cda4271
...@@ -157,7 +157,19 @@ base::LazyInstance<ContentActionFactory>::Leaky ...@@ -157,7 +157,19 @@ base::LazyInstance<ContentActionFactory>::Leaky
// RequestContentScript // RequestContentScript
// //
RequestContentScript::ScriptData::ScriptData() {} struct RequestContentScript::ScriptData {
ScriptData();
~ScriptData();
std::vector<std::string> css_file_names;
std::vector<std::string> js_file_names;
bool all_frames;
bool match_about_blank;
};
RequestContentScript::ScriptData::ScriptData()
: all_frames(false),
match_about_blank(false) {}
RequestContentScript::ScriptData::~ScriptData() {} RequestContentScript::ScriptData::~ScriptData() {}
// static // static
......
...@@ -92,15 +92,7 @@ class ContentAction : public base::RefCounted<ContentAction> { ...@@ -92,15 +92,7 @@ class ContentAction : public base::RefCounted<ContentAction> {
// Action that injects a content script. // Action that injects a content script.
class RequestContentScript : public ContentAction { class RequestContentScript : public ContentAction {
public: public:
struct ScriptData { struct ScriptData;
ScriptData();
~ScriptData();
std::vector<std::string> css_file_names;
std::vector<std::string> js_file_names;
bool all_frames;
bool match_about_blank;
};
RequestContentScript(content::BrowserContext* browser_context, RequestContentScript(content::BrowserContext* browser_context,
const Extension* extension, const Extension* extension,
......
...@@ -2197,11 +2197,3 @@ content.dll!content::WebContentsImpl::CreateRenderViewForRenderManager ...@@ -2197,11 +2197,3 @@ content.dll!content::WebContentsImpl::CreateRenderViewForRenderManager
content.dll!content::NavigationControllerImpl::LoadEntry content.dll!content::NavigationControllerImpl::LoadEntry
... ...
*!extensions::ExtensionHost::LoadInitialURL *!extensions::ExtensionHost::LoadInitialURL
UNINITIALIZED READ
name=bug_409865
*!Pickle::WriteBool
*!extensions::UserScript::Pickle
*!extensions::`anonymous namespace'::Serialize
*!extensions::`anonymous namespace'::LoadScriptsOnFileThread
*!base::internal::RunnableAdapter<>::Run
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment