| Index: third_party/libaddressinput/chromium/cpp/src/retriever.h
|
| diff --git a/third_party/libaddressinput/chromium/cpp/src/retriever.h b/third_party/libaddressinput/chromium/cpp/src/retriever.h
|
| index 469f66bfde10fea02c34256f0138501db5f7cdfa..463fd44103c96867f7d32256268a69ad63337c95 100644
|
| --- a/third_party/libaddressinput/chromium/cpp/src/retriever.h
|
| +++ b/third_party/libaddressinput/chromium/cpp/src/retriever.h
|
| @@ -31,10 +31,10 @@ class Downloader;
|
| class Storage;
|
|
|
| // Manages downloading data and caching it locally. Sample usage:
|
| -// Storage* storage = ...;
|
| -// Downloader* downloader = ...;
|
| +// Storage* storage = new Storage;
|
| +// scoped_ptr<Downloader> downloader(new Downloader);
|
| // Retriever retriever("https://i18napis.appspot.com/ssl-aggregate-address/",
|
| -// downloader, storage);
|
| +// downloader.Pass(), storage);
|
| // retriever.Retrieve("data/CA/AB--fr",
|
| // BuildCallback(this, &MyClass::OnDataRetrieved));
|
| class Retriever {
|
| @@ -43,7 +43,7 @@ class Retriever {
|
|
|
| Retriever(const std::string& validation_data_url,
|
| scoped_ptr<Downloader> downloader,
|
| - scoped_ptr<Storage> storage);
|
| + Storage* storage);
|
| ~Retriever();
|
|
|
| // Retrieves the data for |key| and invokes the |retrieved| callback. Checks
|
| @@ -88,7 +88,7 @@ class Retriever {
|
|
|
| const std::string validation_data_url_;
|
| scoped_ptr<Downloader> downloader_;
|
| - scoped_ptr<Storage> storage_;
|
| + Storage* storage_; // weak.
|
|
|
| // Holds pending requests. The callback pointers are owned.
|
| std::map<std::string, Callback*> requests_;
|
|
|