335564 - rename variables from protection to safebrowsing or urlclassifier

Status: RESOLVED FIXED

(Toolkit :: Safe Browsing, defect)

Description

[Tony Chang (Google)]

After the directory rename (bug 335032), we need to rename the paths in the toolkit.jar file as well and the name of many of the objects.

Comment 1

[Tony Chang (Google)]

Attachment: renaming variables

Renaming variables to avoid confusion.  We should also rename the files, but that will happen in a different CL so it's clear what's actually changing.

Comment 2

[Brett Wilson]

Comment on attachment 219906 [details] [diff] [review]
renaming variables

Looks OK, except you should rename the .idl files to correspond to the new interface names.

Comment 3

[Tony Chang (Google)]

Can I do that in a separate change so the edits are easy to distinguish from the file renames?

Comment 4

[Brett Wilson]

(In reply to comment #3)
> Can I do that in a separate change so the edits are easy to distinguish from
> the file renames?

OK. I'll check this in in a minute.

Comment 5

[Brett Wilson]

Comment on attachment 219906 [details] [diff] [review]
renaming variables

(file renames to be in next patch)

Comment 6

[Ben Goodger (use ben at mozilla dot org for email)]

Comment on attachment 219906 [details] [diff] [review]
renaming variables

> PROT_GlobalStore.getAppDirectoryName = function() {
>-  return PROT_GlobalStore.getPref_("protection.datadirectory");
>+  return PROT_GlobalStore.getPref_("safebrowsing.datadirectory");

If the name of this is "urlclassifier" and not "protection" then why is this "safebrowsing.datadirectory" and not "urlclassifier.datadirectory"?

Comment 7

[Tony Chang (Google)]

(In reply to comment #6)
> If the name of this is "urlclassifier" and not "protection" then why is this
> "safebrowsing.datadirectory" and not "urlclassifier.datadirectory"?
> 

There could be multiple objects that use the urlclassifier object.  Each may want it's own data directory. It also makes sense to group all the safebrowsing related prefs together.

I don't think it's a big deal either way, so if you want me to change it, I will.

Comment 8

[Ben Goodger (use ben at mozilla dot org for email)]

Wouldn't they need to create a copy of globalstore.js then to change that? If that's not the end of the world, doesn't that imply that globalstore.js is a file that should live in browser/components/safe-browsing instead?

If you are thinking hypothetically, I'd say just rename to urlclassifier. Otherwise I think you need to come up with a better solution...

Comment 9

[Tony Chang (Google)]

Attachment: renaming variables

Renamed to urlclassifier.datadirectory as suggested.

Comment 10

[Ben Goodger (use ben at mozilla dot org for email)]

Comment on attachment 219906 [details] [diff] [review]
renaming variables

Tony said he'd move this to browser/ later

Comment 11

[Brett Wilson]

Fixed on branch and trunk.