| Index: chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
|
| diff --git a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
|
| index 13ae8f62cb5077fa011fd21193a50167a84754a1..527c9365b9e513aab4f2ec5696274815099ad77e 100644
|
| --- a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
|
| +++ b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
|
| @@ -33,6 +33,8 @@ namespace {
|
| const char kFooLabel[] = "foo_label";
|
| const char kFooPackage[] = "com.foo";
|
|
|
| +} // namespace
|
| +
|
| class TestDataUseTabModel : public DataUseTabModel {
|
| public:
|
| TestDataUseTabModel() {}
|
| @@ -48,10 +50,6 @@ class DataUseUITabModelTest : public testing::Test {
|
| : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
|
| DataUseUITabModel* data_use_ui_tab_model() { return &data_use_ui_tab_model_; }
|
|
|
| - ExternalDataUseObserver* external_data_use_observer() const {
|
| - return external_data_use_observer_.get();
|
| - }
|
| -
|
| TestDataUseTabModel* data_use_tab_model() const {
|
| return data_use_tab_model_.get();
|
| }
|
| @@ -80,7 +78,7 @@ class DataUseUITabModelTest : public testing::Test {
|
|
|
| data_use_tab_model_.reset(new TestDataUseTabModel());
|
| data_use_tab_model_->InitOnUIThread(
|
| - io_task_runner_, external_data_use_observer_->GetWeakPtr());
|
| + external_data_use_observer_->external_data_use_observer_bridge_);
|
| data_use_ui_tab_model_.SetDataUseTabModel(data_use_tab_model_.get());
|
| data_use_tab_model_->OnControlAppInstallStateChange(true);
|
| }
|
| @@ -95,8 +93,6 @@ class DataUseUITabModelTest : public testing::Test {
|
| scoped_ptr<TestDataUseTabModel> data_use_tab_model_;
|
| };
|
|
|
| -} // namespace
|
| -
|
| // Tests that DataUseTabModel is notified of tab closure and navigation events,
|
| // and DataUseTabModel notifies DataUseUITabModel.
|
| TEST_F(DataUseUITabModelTest, ReportTabEventsTest) {
|
|
|