Eliminate silently letting errors pass on pak loading.

components/dom_distiller/core/distiller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"

[bengr, 2014/09/05 00:59:56]

Do you still need this?

[Avi (use Gerrit), 2014/09/05 15:17:42]

Probably not. Removed.

 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/fake_distiller_page.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/dom_distiller_js/dom_distiller.pb.h"
 #include "third_party/dom_distiller_js/dom_distiller_json_converter.h"
-#include "ui/base/resource/resource_bundle.h"
 
 using std::vector;
 using std::string;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::_;
 
 using dom_distiller::proto::DomDistillerOptions;
 using dom_distiller::proto::DomDistillerResult;
 
@@ skipping 140 matching lines @@
     const vector<int>& image_ids_for_page = distiller_data->image_ids[page_num];
     for (size_t img_num = 0; img_num < image_ids_for_page.size(); ++img_num) {
       EXPECT_EQ(kImageData[image_ids_for_page[img_num]],
                 page.image(img_num).data());
       EXPECT_EQ(GetImageName(page_num + 1, img_num),
                 page.image(img_num).name());
     }
   }
 }
 
-void AddComponentsResources() {
-  base::FilePath pak_file;
-  base::FilePath pak_dir;
-  PathService::Get(base::DIR_MODULE, &pak_dir);
-  pak_file = pak_dir.Append(FILE_PATH_LITERAL("components_resources.pak"));
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_file, ui::SCALE_FACTOR_NONE);
-}
-
 }  // namespace
 
 namespace dom_distiller {
 
 using test::MockDistillerPage;
 using test::MockDistillerPageFactory;
 
 class TestDistillerURLFetcher : public DistillerURLFetcher {
  public:
   explicit TestDistillerURLFetcher(bool delay_fetch)
@@ skipping 41 matching lines @@
   MockDistillerURLFetcherFactory() : DistillerURLFetcherFactory(NULL) {}
   virtual ~MockDistillerURLFetcherFactory() {}
 
   MOCK_CONST_METHOD0(CreateDistillerURLFetcher, DistillerURLFetcher*());
 };
 
 class DistillerTest : public testing::Test {
  public:
   virtual ~DistillerTest() {}
 
-  virtual void SetUp() OVERRIDE {
-    AddComponentsResources();
-  }
-
   void OnDistillArticleDone(scoped_ptr<DistilledArticleProto> proto) {
     article_proto_ = proto.Pass();
   }
 
   void OnDistillArticleUpdate(const ArticleDistillationUpdate& article_update) {
     in_sequence_updates_.push_back(article_update);
   }
 
   void DistillPage(const std::string& url,
                    scoped_ptr<DistillerPage> distiller_page) {
@@ skipping 367 matching lines @@
 
   ASSERT_TRUE(distiller_page);
   // Post the task to execute javascript and then delete the distiller.
   distiller_page->OnDistillationDone(GURL(kURL), distilled_value.get());
   distiller_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace dom_distiller