fix macro, comments and unused includes

BUG=none

Review URL: https://chromiumcodereview.appspot.com/23591028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221499 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index a5e3968..06198ca 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -23,9 +23,9 @@
 }
 
 RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root) {
-  RootWindowSettings* property = new RootWindowSettings();
-  root->SetProperty(kRootWindowSettingsKey, property);
-  return property;
+  RootWindowSettings* settings = new RootWindowSettings();
+  root->SetProperty(kRootWindowSettingsKey, settings);
+  return settings;
 }
 
 RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root) {