Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: ui/base/ime/chromeos/composition_text_chromeos_unittest.cc

Issue 1149223004: Avoid basename conflict in text_composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
diff --git a/ui/base/ime/chromeos/composition_text_unittest.cc b/ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
similarity index 97%
rename from ui/base/ime/chromeos/composition_text_unittest.cc
rename to ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
index 595d44b39af9a88b9d060ad05a40d56bf52252c1..067681e466961d43344ba157eb81f1babf6d11f5 100644
--- a/ui/base/ime/chromeos/composition_text_unittest.cc
+++ b/ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
// TODO(nona): Add more tests.
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
« no previous file with comments | « ui/base/ime/chromeos/composition_text_chromeos.cc ('k') | ui/base/ime/chromeos/composition_text_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698