Make base::Value::TYPE a scoped enum.

google_apis/drive/drive_api_parser_unittest.cc

 // Copyright (c) 2012 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 "google_apis/drive/drive_api_parser.h"
 
 #include "base/time/time.h"
 #include "base/values.h"
 #include "google_apis/drive/test_util.h"
 #include "google_apis/drive/time_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
 
 // Test about resource parsing.
 TEST(DriveAPIParserTest, AboutResourceParser) {
   std::string error;
   std::unique_ptr<base::Value> document =
       test_util::LoadJSONFile("drive/about.json");
   ASSERT_TRUE(document.get());
 
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());
+  ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
   std::unique_ptr<AboutResource> resource(new AboutResource());
   EXPECT_TRUE(resource->Parse(*document));
 
   EXPECT_EQ("0AIv7G8yEYAWHUk9123", resource->root_folder_id());
   EXPECT_EQ(5368709120LL, resource->quota_bytes_total());
   EXPECT_EQ(1073741824LL, resource->quota_bytes_used_aggregate());
   EXPECT_EQ(8177LL, resource->largest_change_id());
 }
 
 // Test app list parsing.
 TEST(DriveAPIParserTest, AppListParser) {
   std::string error;
   std::unique_ptr<base::Value> document =
       test_util::LoadJSONFile("drive/applist.json");
   ASSERT_TRUE(document.get());
 
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());
+  ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
   std::unique_ptr<AppList> applist(new AppList);
   EXPECT_TRUE(applist->Parse(*document));
 
   EXPECT_EQ("\"Jm4BaSnCWNND-noZsHINRqj4ABC/tuqRBw0lvjUdPtc_2msA1tN4XYZ\"",
             applist->etag());
   ASSERT_EQ(2U, applist->items().size());
   // Check Drive app 1
   const AppResource& app1 = *applist->items()[0];
   EXPECT_EQ("123456788192", app1.application_id());
   EXPECT_EQ("Drive app 1", app1.name());
@@ skipping 57 matching lines @@
   EXPECT_EQ("https://www.example.com/createForApp2", app2.create_url().spec());
 }
 
 // Test file list parsing.
 TEST(DriveAPIParserTest, FileListParser) {
   std::string error;
   std::unique_ptr<base::Value> document =
       test_util::LoadJSONFile("drive/filelist.json");
   ASSERT_TRUE(document.get());
 
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());
+  ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
   std::unique_ptr<FileList> filelist(new FileList);
   EXPECT_TRUE(filelist->Parse(*document));
 
   EXPECT_EQ(GURL("https://www.googleapis.com/drive/v2/files?pageToken=EAIaggEL"
                  "EgA6egpi96It9mH_____f_8AAP__AAD_okhU-cHLz83KzszMxsjMzs_RyNGJ"
                  "nridyrbHs7u9tv8AAP__AP7__n__AP8AokhU-cHLz83KzszMxsjMzs_RyNGJ"
                  "nridyrbHs7u9tv8A__4QZCEiXPTi_wtIgTkAAAAAngnSXUgCDEAAIgsJPgar"
                  "t10AAAAABC"), filelist->next_link());
 
   ASSERT_EQ(3U, filelist->items().size());
@@ skipping 81 matching lines @@
   EXPECT_EQ(0U, file3.open_with_links().size());
 }
 
 // Test change list parsing.
 TEST(DriveAPIParserTest, ChangeListParser) {
   std::string error;
   std::unique_ptr<base::Value> document =
       test_util::LoadJSONFile("drive/changelist.json");
   ASSERT_TRUE(document.get());
 
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());
+  ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
   std::unique_ptr<ChangeList> changelist(new ChangeList);
   EXPECT_TRUE(changelist->Parse(*document));
 
   EXPECT_EQ("https://www.googleapis.com/drive/v2/changes?pageToken=8929",
             changelist->next_link().spec());
   EXPECT_EQ(13664, changelist->largest_change_id());
 
   ASSERT_EQ(4U, changelist->items().size());
 
   const ChangeResource& change1 = *changelist->items()[0];
@@ skipping 38 matching lines @@
       test_util::LoadJSONFile("drive/filelist.json"));
 
   EXPECT_TRUE(ChangeList::HasChangeListKind(*change_list_json));
   EXPECT_FALSE(ChangeList::HasChangeListKind(*file_list_json));
 
   EXPECT_FALSE(FileList::HasFileListKind(*change_list_json));
   EXPECT_TRUE(FileList::HasFileListKind(*file_list_json));
 }
 
 }  // namespace google_apis