Merge arc/common/settings.mojom into intent_helper.mojom

chrome/browser/chromeos/arc/settings_bridge_unittest.cc

 // Copyright (c) 2015 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 "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"
+#include "chrome/browser/chromeos/arc/settings_bridge.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 
 namespace fontsizes {
 
-TEST(ArcSettingsBridgeTest, FontSizeConvertChromeToAndroid) {
+TEST(SettingsBridgeTest, FontSizeConvertChromeToAndroid) {
   // Does not return a value smaller than Small.
   EXPECT_DOUBLE_EQ(kAndroidFontScaleSmall,
                    ConvertFontSizeChromeToAndroid(0, 0, 0));
 
   // Does not return a value larger than Huge
   EXPECT_DOUBLE_EQ(kAndroidFontScaleHuge,
                    ConvertFontSizeChromeToAndroid(100, 100, 100));
 
   // The max of any Chrome values is what determines the Android value.
   EXPECT_DOUBLE_EQ(kAndroidFontScaleLarge,
@@ skipping 20 matching lines @@
                    ConvertFontSizeChromeToAndroid(20, 0, 0));
 
   // Very large converts properly.
   EXPECT_DOUBLE_EQ(kAndroidFontScaleHuge,
                    ConvertFontSizeChromeToAndroid(24, 0, 0));
 }
 
 }  // namespace fontsizes
 
 }  // namespace arc