Integrated obfuscation with quota; all unit tests now pass

webkit/fileapi/file_system_origin_database_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 127 matching lines @@
   std::string origin1("origin1");
 
   EXPECT_FALSE(database.HasOriginPath(origin0));
   EXPECT_FALSE(database.HasOriginPath(origin1));
 
   FilePath path0;
   FilePath path1;
   EXPECT_TRUE(database.GetPathForOrigin(origin0, &path0));
   EXPECT_TRUE(database.ListAllOrigins(&origins));
   EXPECT_EQ(origins.size(), 1UL);
-  EXPECT_EQ(origins[0].first, origin0);
-  EXPECT_EQ(origins[0].second, path0);
+  EXPECT_EQ(origins[0].origin, origin0);
+  EXPECT_EQ(origins[0].path, path0);
   origins.clear();
   EXPECT_TRUE(database.GetPathForOrigin(origin1, &path1));
   EXPECT_TRUE(database.ListAllOrigins(&origins));
   EXPECT_EQ(origins.size(), 2UL);
-  if (origins[0].first == origin0) {
-    EXPECT_EQ(origins[0].second, path0);
-    EXPECT_EQ(origins[1].first, origin1);
-    EXPECT_EQ(origins[1].second, path1);
+  if (origins[0].origin == origin0) {
+    EXPECT_EQ(origins[0].path, path0);
+    EXPECT_EQ(origins[1].origin, origin1);
+    EXPECT_EQ(origins[1].path, path1);
   } else {
-    EXPECT_EQ(origins[0].first, origin1);
-    EXPECT_EQ(origins[0].second, path1);
-    EXPECT_EQ(origins[1].first, origin0);
-    EXPECT_EQ(origins[1].second, path0);
+    EXPECT_EQ(origins[0].origin, origin1);
+    EXPECT_EQ(origins[0].path, path1);
+    EXPECT_EQ(origins[1].origin, origin0);
+    EXPECT_EQ(origins[1].path, path0);
   }
 }
 
 }  // namespace fileapi