Mac/Aura compile fixes for new accelerator / dispatcher code

Gets things compiling and running again on Mac/Aura after new
accelerator / dispatcher changes.

BUG=None
TEST=aura_shell_unittests
R=sky@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121186 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 10 deletions

diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 7e10039..48a4d9b 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -313,7 +313,7 @@ void TooltipController::UpdateIfRequired() {
   }
   string16 tooltip_text;
   if (tooltip_window_)
-    tooltip_text = *aura::client::GetTooltipText(tooltip_window_);
+    tooltip_text = aura::client::GetTooltipText(tooltip_window_);
 
   // We add the !tooltip_->IsVisible() below because when we come here from
   // TooltipTimerFired(), the tooltip_text may not have changed but we still
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 84d9e95..c56fb97 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -117,9 +117,8 @@ TEST_F(TooltipControllerTest, ViewTooltip) {
   aura::Window* window = widget->GetNativeView();
   EXPECT_EQ(window, aura::RootWindow::GetInstance()->GetEventHandlerForPoint(
       generator.current_location()));
-  EXPECT_TRUE(aura::client::GetTooltipText(window) != NULL);
   string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
-  EXPECT_EQ(expected_tooltip, *aura::client::GetTooltipText(window));
+  EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
   EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText());
   EXPECT_EQ(window, GetTooltipWindow());
 
@@ -130,8 +129,7 @@ TEST_F(TooltipControllerTest, ViewTooltip) {
   generator.MoveMouseBy(1, 0);
 
   EXPECT_TRUE(IsTooltipVisible());
-  EXPECT_TRUE(aura::client::GetTooltipText(window) != NULL);
-  EXPECT_EQ(expected_tooltip, *aura::client::GetTooltipText(window));
+  EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
   EXPECT_EQ(expected_tooltip, GetTooltipText());
   EXPECT_EQ(window, GetTooltipWindow());
 }
@@ -161,9 +159,8 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
     EXPECT_EQ(window,
         aura::RootWindow::GetInstance()->GetEventHandlerForPoint(
             generator.current_location()));
-    EXPECT_TRUE(aura::client::GetTooltipText(window) != NULL);
     string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
-    EXPECT_EQ(expected_tooltip, *aura::client::GetTooltipText(window));
+    EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
     EXPECT_EQ(expected_tooltip, GetTooltipText());
     EXPECT_EQ(window, GetTooltipWindow());
   }
@@ -173,9 +170,8 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
     EXPECT_EQ(window,
         aura::RootWindow::GetInstance()->GetEventHandlerForPoint(
             generator.current_location()));
-    EXPECT_TRUE(aura::client::GetTooltipText(window) != NULL);
-    string16 expected_tooltip = ASCIIToUTF16("");
-    EXPECT_EQ(expected_tooltip, *aura::client::GetTooltipText(window));
+    string16 expected_tooltip;  // = ""
+    EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
     EXPECT_EQ(expected_tooltip, GetTooltipText());
     EXPECT_EQ(window, GetTooltipWindow());
   }