Change mojo enums to be scoped enums in the generated C++ bindings.

components/web_view/web_view_apptest.cc

 // Copyright 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 "components/web_view/public/cpp/web_view.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/base_paths.h"
@@ skipping 169 matching lines @@
   EXPECT_EQ(kTestOneTitle, last_title());
 }
 
 TEST_F(WebViewTest, CanGoBackAndForward) {
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestOneFile));
 
   // We can't go back on first navigation since there's nothing previously on
   // the stack.
   EXPECT_EQ(GetTestFileURL(kTestOneFile).spec(), navigation_url());
   EXPECT_EQ(kTestOneTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_forward_button_state());
 
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestTwoFile));
 
   EXPECT_EQ(kTestTwoTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED, last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::ENABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_forward_button_state());
 
   web_view()->GoBack();
   StartNestedRunLoopUntil(LOADING_DONE);
 
   EXPECT_EQ(GetTestFileURL(kTestOneFile).spec(), navigation_url());
   EXPECT_EQ(kTestOneTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::ENABLED, last_forward_button_state());
 
   web_view()->GoForward();
   StartNestedRunLoopUntil(LOADING_DONE);
   EXPECT_EQ(GetTestFileURL(kTestTwoFile).spec(), navigation_url());
   EXPECT_EQ(kTestTwoTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED, last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::ENABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_forward_button_state());
 }
 
 TEST_F(WebViewTest, NavigationClearsForward) {
   // First navigate somewhere, navigate somewhere else, and go back so we have
   // one item in the forward stack.
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestOneFile));
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestTwoFile));
 
   web_view()->GoBack();
   StartNestedRunLoopUntil(LOADING_DONE);
 
   EXPECT_EQ(GetTestFileURL(kTestOneFile).spec(), navigation_url());
   EXPECT_EQ(kTestOneTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::ENABLED, last_forward_button_state());
 
   // Now navigate to a third file. This should clear the forward stack.
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestThreeFile));
 
   EXPECT_EQ(GetTestFileURL(kTestThreeFile).spec(), navigation_url());
   EXPECT_EQ(kTestThreeTitle, last_title());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED, last_back_button_state());
-  EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
-            last_forward_button_state());
+  EXPECT_EQ(mojom::ButtonState::ENABLED, last_back_button_state());
+  EXPECT_EQ(mojom::ButtonState::DISABLED, last_forward_button_state());
 }
 
 TEST_F(WebViewTest, Find) {
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTheWordGreenFiveTimes));
 
   web_view()->Find("Green", true);
   StartNestedRunLoopUntil(FINAL_FIND_UPATE);
   EXPECT_EQ(1, active_find_match());
   EXPECT_EQ(5, find_count());
 }
@@ skipping 62 matching lines @@
     EXPECT_EQ(i, active_find_match());
   }
 
   // We should wrap around.
   web_view()->Find("Green", true);
   StartNestedRunLoopUntil(ACTIVE_FIND_UPDATE);
   EXPECT_EQ(1, active_find_match());
 }
 
 }  // namespace web_view