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

chrome/browser/chromeos/arc/settings_bridge_unittest.cc

Index: chrome/browser/chromeos/arc/settings_bridge_unittest.cc
diff --git a/chrome/browser/chromeos/arc/arc_settings_bridge_unittest.cc b/chrome/browser/chromeos/arc/settings_bridge_unittest.cc
similarity index 93%
rename from chrome/browser/chromeos/arc/arc_settings_bridge_unittest.cc
rename to chrome/browser/chromeos/arc/settings_bridge_unittest.cc
index 4eba5b2f1f2e2c920e0ba38b1072c49e7ad7457a..a89f77d48e02ebbd913c40dc0f46727612015737 100644
--- a/chrome/browser/chromeos/arc/arc_settings_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/settings_bridge_unittest.cc
@@ -2,7 +2,7 @@
 // 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.h"
+#include "chrome/browser/chromeos/arc/settings_bridge.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -10,7 +10,7 @@ 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));