Cleanup in preparation for upstreaming.

R=macdome

Review URL: http://codereview.chromium.org/17623

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

3 files changed, 31 insertions, 31 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 30eb01f..b2c1c63 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -881,10 +881,10 @@ input_files = [
 if env.Bit('windows'):
   # Windows specific implementations.
   input_files.extend([
-    '$WEBCORE_DIR/platform/chromium/ChromiumUtilsWin.cpp',
     '$WEBCORE_DIR/platform/chromium/FileSystemChromiumWin.cpp',
     '$WEBCORE_DIR/platform/chromium/ScrollBarThemeChromiumWin.cpp',
     '$WEBCORE_DIR/platform/chromium/SoundChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/chromium/WindowsVersion.cpp',
 
     '$WEBCORE_DIR/platform/graphics/chromium/FontCacheChromiumWin.cpp',
     '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index b41bb52..cd0be02 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1596,6 +1596,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\PlatformIcon.h"
 						>
 					</File>
@@ -1627,14 +1635,6 @@
 						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelperTextRun.h"
 						>
 					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.h"
-						>
-					</File>
 				</Filter>
 				<Filter
 					Name="skia"
@@ -2185,14 +2185,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumUtilsWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumUtilsWin.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardChromium.cpp"
 					>
 				</File>
@@ -2368,6 +2360,14 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\WidgetChromium.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\WindowsVersion.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\WindowsVersion.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/webkit/glue/clipboard_conversion.cc b/webkit/glue/clipboard_conversion.cc
index 7bf8c51..02a14ab 100644
--- a/webkit/glue/clipboard_conversion.cc
+++ b/webkit/glue/clipboard_conversion.cc
@@ -22,23 +22,23 @@ WebDropData ChromiumDataObjectToWebDropData(
     WebCore::ChromiumDataObject* data_object) {
   WebDropData drop_data;
   drop_data.url = KURLToGURL(data_object->url);
-  drop_data.url_title = StringToStdWString(data_object->url_title);
+  drop_data.url_title = StringToStdWString(data_object->urlTitle);
 
   for (size_t i = 0; i < data_object->filenames.size(); ++i) {
     drop_data.filenames.push_back(StringToStdWString(
         data_object->filenames[i]));
   }
 
-  drop_data.plain_text = StringToStdWString(data_object->plain_text);
+  drop_data.plain_text = StringToStdWString(data_object->plainText);
 
-  drop_data.text_html = StringToStdWString(data_object->text_html);
-  drop_data.html_base_url = KURLToGURL(data_object->html_base_url);
+  drop_data.text_html = StringToStdWString(data_object->textHtml);
+  drop_data.html_base_url = KURLToGURL(data_object->htmlBaseUrl);
 
   drop_data.file_description_filename = StringToStdWString(
-      data_object->file_content_filename);
-  if (data_object->file_content) {
-    drop_data.file_contents.assign(data_object->file_content->data(),
-        data_object->file_content->size());
+      data_object->fileContentFilename);
+  if (data_object->fileContent) {
+    drop_data.file_contents.assign(data_object->fileContent->data(),
+        data_object->fileContent->size());
   }
 
   return drop_data;
@@ -49,21 +49,21 @@ PassRefPtr<WebCore::ChromiumDataObject> WebDropDataToChromiumDataObject(
   RefPtr<WebCore::ChromiumDataObject> data_object =
       WebCore::ChromiumDataObject::create();
   data_object->url = GURLToKURL(drop_data.url);
-  data_object->url_title = StdWStringToString(drop_data.url_title);
+  data_object->urlTitle = StdWStringToString(drop_data.url_title);
 
   for (size_t i = 0; i < drop_data.filenames.size(); ++i) {
     data_object->filenames.append(StdWStringToString(drop_data.filenames[i]));
   }
 
-  data_object->plain_text = StdWStringToString(drop_data.plain_text);
+  data_object->plainText = StdWStringToString(drop_data.plain_text);
 
-  data_object->text_html = StdWStringToString(drop_data.text_html);
-  data_object->html_base_url = GURLToKURL(drop_data.html_base_url);
+  data_object->textHtml = StdWStringToString(drop_data.text_html);
+  data_object->htmlBaseUrl = GURLToKURL(drop_data.html_base_url);
 
-  data_object->file_content_filename = StdWStringToString(
+  data_object->fileContentFilename = StdWStringToString(
       drop_data.file_description_filename);
   if (!drop_data.file_contents.empty()) {
-    data_object->file_content =
+    data_object->fileContent =
         WebCore::SharedBuffer::create(drop_data.file_contents.data(),
                                       drop_data.file_contents.size());
   }