ui: Android changes.

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 <map>
 
 #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/values.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/distiller_page.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 "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
 using::testing::Invoke;
 using::testing::Return;
 using::testing::_;
 
 namespace {
   const char kTitle[] = "Title";
   const char kContent[] = "Content";
@@ skipping 126 matching lines @@
   EXPECT_EQ(kContent, proto_->html());
   EXPECT_EQ(kURL, proto_->url());
   EXPECT_EQ(2, proto_->image_size());
   EXPECT_EQ(kImageData0, proto_->image(0).data());
   EXPECT_EQ(kId0, proto_->image(0).name());
   EXPECT_EQ(kImageData1, proto_->image(1).data());
   EXPECT_EQ(kId1, proto_->image(1).name());
 }
 
 }  // namespace dom_distiller